410 files changed, 46301 insertions, 63466 deletions

diff --git a/AUTHORS b/AUTHORS
index 548bc8a61..1d8f49f80 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ Program: GnuPG
 Maintainer:  Werner Koch <[email protected]>
 Bug reports: <[email protected]>
 Security related bug reports: <[email protected]>
+License: GPLv3+
 
 
 Authors
@@ -158,7 +159,7 @@ name gpg2keys_*.
 =========
 
  Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2005,
-           2006 Free Software Foundation, Inc.
+           2006, 2007 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/COPYING b/COPYING
index d60c31a97..443254047 100644
--- a/COPYING
+++ b/COPYING
@@ -1,284 +1,626 @@
+
 		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -287,15 +629,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program 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
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +646,31 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/COPYING.LIB b/COPYING.LIB
new file mode 100644
index 000000000..fc8a5de7e
--- /dev/null
+++ b/COPYING.LIB
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/ChangeLog b/ChangeLog
index a7f7ac7f9..1be71bc9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Add no-dist-gzip.
+
+	Switched entire package to GPLv3+.
+
+	* configure.ac: Require libksba 1.0.2.
+
+	* COPYING:  Updated to GPLv3.
+	* COPYING.LIB: New as jnlib/ uses this license.
+
+	* gl/: Switched to GPLv3+.
+
+	* intl/ Removed.
+	* configure.ac (AM_GNU_GETTEXT): Add external flag.
+	(AM_ICONV): New.
+
 2007-07-03  Werner Koch  <[email protected]>
 
 	* configure.ac [W32]: Use ws2_32 instead of wsock32.
diff --git a/Makefile.am b/Makefile.am
index 8d51a2e05..7642e4024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 # 
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,14 +14,12 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-AUTOMAKE_OPTIONS = dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto
 
 EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN
@@ -73,7 +71,7 @@ else
 tests = tests
 endif
 
-SUBDIRS = m4 intl gl include jnlib common ${kbx} \
+SUBDIRS = m4 gl include jnlib common ${kbx} \
  ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${tools} po ${doc} ${tests}
 
 dist-hook:
diff --git a/NEWS b/NEWS
index a567c58f9..097ce3571 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 Noteworthy changes in version 2.0.5
 ------------------------------------------------
 
- * Fixed bug when using the --p12-charset without --armor.
+ * Switched license to GPLv3.
+
+ * Basic support for Windows.  Run "./autogen.sh --build-w32" to build
+   it.  As usual the mingw cross compiling toolchain is required.
 
- * Changes required for a port to Windows.
+ * Fixed bug when using the --p12-charset without --armor.
 
  * The command --gen-key may now be used instead of the
    gpgsm-gencert.sh script.
diff --git a/README b/README
index d6f9ec5e1..3c068fd95 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
                              Version 2.0
 
          Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-            2005, 2006,2007 Free Software Foundation, Inc.
+           2005, 2006, 2007 Free Software Foundation, Inc.
 
 
 INTRODUCTION
diff --git a/TODO b/TODO
index 1d34988d4..842676c01 100644
--- a/TODO
+++ b/TODO
@@ -72,8 +72,6 @@
 ** Add a test to check the extkeyusage.
 
 * Windows port (W32)
-** Signals are not support 
-    This means we can't reread a configuration
 ** No card status notifications.
 ** Regex support is disabled
   We need to adjust the test to find the regex we have anyway in 
@@ -93,10 +91,6 @@
 ** issue a NO_SECKEY xxxx if a -u key was not found.
 
 
-* When requiring libksba 1.0.1
-** Remove the extra GPG_ERR_NO_VALUE tests 
-   They have been added on 2006-10-18 to fix a libksba problem.
-
 * When switching to libgcrypt 1.3
 ** scd#encode_md_for_card, g10#encode_md_value, sm@do_encode_md
    Remove the extra test for a valid algorithm as libgcrypt will do it
diff --git a/acinclude.m4 b/acinclude.m4
index fd5245927..d8f2e174b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,7 +5,7 @@ dnl This file is part of GnuPG.
 dnl
 dnl GnuPG is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or
 dnl (at your option) any later version.
 dnl 
 dnl GnuPG is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+dnl along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 dnl Check whether a typedef exists and create a #define $2 if it exists
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 73bcfe10a..adf6b70a0 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,6 +1,7 @@
 2007-07-04  Werner Koch  <[email protected]>
 
 	* gpg-agent.c (TIMERTICK_INTERVAL): New.
+	(fixed_gcry_pth_init, main): Kludge to fix Pth initialization.
 
 2007-07-03  Werner Koch  <[email protected]>
 
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 74c1cf810..73fe935be 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/agent/agent.h b/agent/agent.h
index 17c7eed56..22225f6a2 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AGENT_H
diff --git a/agent/cache.c b/agent/cache.c
index 2f468396d..addd1e8e1 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index e995c4f1c..6d577ba02 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/call-scd.c b/agent/call-scd.c
index b62ab97ea..8c81812ac 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 97277fcba..4fc9d4df5 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Only v2 of the ssh-agent protocol is implemented.  */
diff --git a/agent/command.c b/agent/command.c
index 0c0cb54ed..56492e107 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* FIXME: we should not use the default assuan buffering but setup
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 81b4d7c4b..25207331f 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/findkey.c b/agent/findkey.c
index 1510a9081..35254c433 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/genkey.c b/agent/genkey.c
index 9396e54d5..012675a7c 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index a75acec94..626581779 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -232,6 +230,10 @@ static int check_for_running_agent (int silent, int mode);
 
 /* Pth wrapper function definitions. */
 GCRY_THREAD_OPTION_PTH_IMPL;
+static int fixed_gcry_pth_init (void)
+{
+  return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
+}
 
 
 
@@ -457,6 +459,7 @@ main (int argc, char **argv )
 
   /* Libgcrypt requires us to register the threading model first.
      Note that this will also do the pth_init. */
+  gcry_threads_pth.init = fixed_gcry_pth_init;
   err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
   if (err)
     {
diff --git a/agent/learncard.c b/agent/learncard.c
index fac12bea2..946319432 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/minip12.c b/agent/minip12.c
index a551a3cf9..f9e9f3169 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/agent/minip12.h b/agent/minip12.h
index 7977fcb02..998f82f6a 100644
--- a/agent/minip12.h
+++ b/agent/minip12.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MINIP12_H
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index e7fc14240..80f92dd0c 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/pksign.c b/agent/pksign.c
index c187eccae..817ce6ea5 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 7ff842565..dbb8025b1 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 9154d4f81..08a446aef 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/protect.c b/agent/protect.c
index ee1b5ec2b..ce723fe9a 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/t-protect.c b/agent/t-protect.c
index 9ddd49414..aadbe6adc 100644
--- a/agent/t-protect.c
+++ b/agent/t-protect.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/trans.c b/agent/trans.c
index 5eb7d25c0..9e48889d3 100644
--- a/agent/trans.c
+++ b/agent/trans.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* To avoid any problems with the gettext implementation (there used
diff --git a/agent/trustlist.c b/agent/trustlist.c
index 10ef02847..d3c409b0b 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/w32main.c b/agent/w32main.c
index 176050220..bcdf340d5 100644
--- a/agent/w32main.c
+++ b/agent/w32main.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/agent/w32main.h b/agent/w32main.h
index c1b3f7d70..7a6cc1c9e 100644
--- a/agent/w32main.h
+++ b/agent/w32main.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AGENT_W32MAIN_H
diff --git a/am/cmacros.am b/am/cmacros.am
index 47538ac19..be34ca372 100644
--- a/am/cmacros.am
+++ b/am/cmacros.am
@@ -5,7 +5,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 localedir = $(datadir)/locale
 
diff --git a/common/ChangeLog b/common/ChangeLog
index f6ef06e80..cbdf9ffca 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* estream.c (es_init_do): Do not throw an error if pth as already
+	been initialized.
+
 2007-06-26  Werner Koch  <[email protected]>
 
 	* Makefile.am ($(PROGRAMS)): New.
diff --git a/common/Makefile.am b/common/Makefile.am
index 73951c463..3a064f316 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/common/asshelp.c b/common/asshelp.c
index 024128042..269e897db 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/asshelp.h b/common/asshelp.h
index adf81f9b7..eb5a41c1d 100644
--- a/common/asshelp.h
+++ b/common/asshelp.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_ASSHELP_H
diff --git a/common/b64enc.c b/common/b64enc.c
index 73e3d4f64..e886f9403 100644
--- a/common/b64enc.c
+++ b/common/b64enc.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/common-defs.h b/common/common-defs.h
index 96d0a1f32..4a550c310 100644
--- a/common/common-defs.h
+++ b/common/common-defs.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_COMMON_DEFS_H
diff --git a/common/convert.c b/common/convert.c
index d5301b8e7..7aa6354d6 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/dns-cert.c b/common/dns-cert.c
index 8dfcb9724..ee3b50040 100644
--- a/common/dns-cert.c
+++ b/common/dns-cert.c
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/dns-cert.h b/common/dns-cert.h
index 47e0d5a2d..827533947 100644
--- a/common/dns-cert.h
+++ b/common/dns-cert.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_COMMON_DNS_CERT_H
 #define GNUPG_COMMON_DNS_CERT_H
diff --git a/common/errors.h b/common/errors.h
index 131891f65..7ce199692 100644
--- a/common/errors.h
+++ b/common/errors.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_ERRORS_H
diff --git a/common/estream-printf.c b/common/estream-printf.c
index 76d346953..84a4a9ee9 100644
--- a/common/estream-printf.c
+++ b/common/estream-printf.c
@@ -5,7 +5,7 @@
  *
  * Libestream 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,
+ * by the Free Software Foundation; either version 3 of the License,
  * or (at your option) any later version.
  *
  * Libestream is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Libestream; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * along with Libestream; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id: estream-printf.c 56 2007-05-15 18:38:43Z wk $
  */
diff --git a/common/estream-printf.h b/common/estream-printf.h
index 7035ff8a8..0e4549680 100644
--- a/common/estream-printf.h
+++ b/common/estream-printf.h
@@ -5,7 +5,7 @@
  *
  * Libestream 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,
+ * by the Free Software Foundation; either version 3 of the License,
  * or (at your option) any later version.
  *
  * Libestream is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Libestream; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * along with Libestream; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id: estream-printf.h 56 2007-05-15 18:38:43Z wk $
  */
diff --git a/common/estream.c b/common/estream.c
index 5b953b5d2..f43690d0a 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -5,7 +5,7 @@
  *
  * Libestream 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,
+ * by the Free Software Foundation; either version 3 of the License,
  * or (at your option) any later version.
  *
  * Libestream is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Libestream; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * along with Libestream; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef USE_ESTREAM_SUPPORT_H
@@ -307,7 +305,7 @@ es_init_do (void)
 
   if (!initialized)
     {
-      if (!pth_init ())
+      if (!pth_init () && errno != EPERM )
         return -1;
       if (pth_mutex_init (&estream_list_lock))
         initialized = 1;
diff --git a/common/estream.h b/common/estream.h
index 79bfbb71b..dd4e47bf6 100644
--- a/common/estream.h
+++ b/common/estream.h
@@ -5,18 +5,16 @@
  *
  * Libestream 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,
+ * by the Free Software Foundation; either version 3 of the License,
  * or (at your option) any later version.
  *
  * Libestream is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Libestream; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * along with Libestream; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ESTREAM_H
diff --git a/common/exechelp.c b/common/exechelp.c
index c488e291a..44e6e837d 100644
--- a/common/exechelp.c
+++ b/common/exechelp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/exechelp.h b/common/exechelp.h
index f78a43c6b..9e482b778 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_EXECHELP_H
diff --git a/common/gettime.c b/common/gettime.c
index c4ea3283a..b33f8aba5 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/gpgrlhelp.c b/common/gpgrlhelp.c
index 4f8e65295..28459aac2 100644
--- a/common/gpgrlhelp.c
+++ b/common/gpgrlhelp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This module may by used by applications to initializes readline
diff --git a/common/homedir.c b/common/homedir.c
index 772bd30d6..212c3509d 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/http.c b/common/http.c
index 293a96a2b..5f7c053fd 100644
--- a/common/http.c
+++ b/common/http.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Simple HTTP client implementation.  We try to keep the code as
diff --git a/common/http.h b/common/http.h
index 0fc2082a3..c92bbf1e6 100644
--- a/common/http.h
+++ b/common/http.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_COMMON_HTTP_H
 #define GNUPG_COMMON_HTTP_H 
diff --git a/common/i18n.c b/common/i18n.c
index d4a98d0e0..1592994d4 100644
--- a/common/i18n.c
+++ b/common/i18n.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/init.c b/common/init.c
index 9ac6006c2..5425acee8 100644
--- a/common/init.c
+++ b/common/init.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -38,7 +36,7 @@
 
 
 /* This function is to be used early at program startup to make sure
-   that some subsystems are initialized.  This is in particualr
+   that some subsystems are initialized.  This is in particular
    important for W32 to initialize the sockets so that our socket
    emulation code used directly as well as in libassuan may be used.
    It should best be called before any I/O is done so that setup
@@ -51,7 +49,7 @@ init_common_subsystems (void)
   set_native_charset (NULL); 
 
 #ifdef HAVE_W32_SYSTEM
-  /* For W32 we need to initialize the socket layer.  This is becuase
+  /* For W32 we need to initialize the socket layer.  This is because
      we use recv and send in libassuan as well as at some other
      places.  If we are building with PTH we let pth_init do it.  We
      can't do much on error so we ignore them.  An error would anyway
diff --git a/common/init.h b/common/init.h
index 83e6c6b2c..14dfa7b39 100644
--- a/common/init.h
+++ b/common/init.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_INIT_H
diff --git a/common/iobuf.c b/common/iobuf.c
index bf5bf8b23..abab69d01 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/iobuf.h b/common/iobuf.h
index f20ea28fa..8a3671ebc 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_IOBUF_H
diff --git a/common/isascii.c b/common/isascii.c
index b71febe99..be14a3843 100644
--- a/common/isascii.c
+++ b/common/isascii.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/common/keyserver.h b/common/keyserver.h
index 3a8f5f43c..6455e8c57 100644
--- a/common/keyserver.h
+++ b/common/keyserver.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_KEYSERVER_H
diff --git a/common/maperror.c b/common/maperror.c
index f0f11c4fa..1369a97bd 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #error This file is not anymore used.
diff --git a/common/membuf.c b/common/membuf.c
index eb436c466..9395eab6d 100644
--- a/common/membuf.c
+++ b/common/membuf.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/membuf.h b/common/membuf.h
index 906ae156c..cb261bd32 100644
--- a/common/membuf.h
+++ b/common/membuf.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_MEMBUF_H
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index fd1861083..b7210ef2b 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/mkerrors b/common/mkerrors
index 994c61352..48c6b896a 100755
--- a/common/mkerrors
+++ b/common/mkerrors
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
@@ -70,4 +68,4 @@ cat <<EOF
   return s;
 }
 
-EOF
\ No newline at end of file
+EOF
diff --git a/common/mkerrtok b/common/mkerrtok
index 67ab42c89..b804ffca7 100755
--- a/common/mkerrtok
+++ b/common/mkerrtok
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 cat <<EOF
 /* Generated automatically by mkerrtok */
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h
index bda70fd72..e8121b12a 100644
--- a/common/openpgpdefs.h
+++ b/common/openpgpdefs.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_OPENPGPDEFS_H
diff --git a/common/pka.c b/common/pka.c
index 3d442d16a..e8cdee61e 100644
--- a/common/pka.c
+++ b/common/pka.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/pka.h b/common/pka.h
index d0b977d0f..98c29ec49 100644
--- a/common/pka.h
+++ b/common/pka.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_COMMON_PKA_H
 #define GNUPG_COMMON_PKA_H
diff --git a/common/sexp-parse.h b/common/sexp-parse.h
index bb96e446f..d2675fbdb 100644
--- a/common/sexp-parse.h
+++ b/common/sexp-parse.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SEXP_PARSE_H
diff --git a/common/sexputil.c b/common/sexputil.c
index 7bac990b3..c7f718660 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file implements a few utility functions useful when working
diff --git a/common/signal.c b/common/signal.c
index 1c82014e0..f48dc6ee5 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index 217ca69cd..6381b9928 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This module is intended as a standalone client implementation to
diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h
index cb5d9354b..8de9b1bd2 100644
--- a/common/simple-pwquery.h
+++ b/common/simple-pwquery.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SIMPLE_PWQUERY_H
diff --git a/common/srv.c b/common/srv.c
index 386e5e459..a39305937 100644
--- a/common/srv.c
+++ b/common/srv.c
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/srv.h b/common/srv.h
index e8ea6952c..fa3586394 100644
--- a/common/srv.h
+++ b/common/srv.h
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_SRV_H
diff --git a/common/sysutils.c b/common/sysutils.c
index a3fc8cb07..47031a152 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/sysutils.h b/common/sysutils.h
index b59f345dd..cc7a50d03 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_SYSUTILS_H
diff --git a/common/t-convert.c b/common/t-convert.c
index ef295985a..ede1e463d 100644
--- a/common/t-convert.c
+++ b/common/t-convert.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/ttyio.c b/common/ttyio.c
index 5b10915d3..84b81820c 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/ttyio.h b/common/ttyio.h
index eed6b0910..3ece73bd5 100644
--- a/common/ttyio.h
+++ b/common/ttyio.h
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_COMMON_TTYIO_H
 #define GNUPG_COMMON_TTYIO_H
diff --git a/common/util.h b/common/util.h
index 11595127a..cdd034206 100644
--- a/common/util.h
+++ b/common/util.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_COMMON_UTIL_H
diff --git a/common/xasprintf.c b/common/xasprintf.c
index d8d688895..9774d06de 100644
--- a/common/xasprintf.c
+++ b/common/xasprintf.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/xreadline.c b/common/xreadline.c
index 7e091e9dd..2b640b3ab 100644
--- a/common/xreadline.c
+++ b/common/xreadline.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/common/yesno.c b/common/yesno.c
index 9ca513740..fdbf7ddd1 100644
--- a/common/yesno.c
+++ b/common/yesno.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/configure.ac b/configure.ac
index 2a1dd8263..2bbca080a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # 
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
@@ -48,7 +46,7 @@ NEED_LIBASSUAN_API=1
 NEED_LIBASSUAN_VERSION=0.9.3
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.0.0
+NEED_KSBA_VERSION=1.0.2
 
 
 PACKAGE=$PACKAGE_NAME
@@ -876,7 +874,8 @@ AC_MSG_NOTICE([checking for gettext])
 AM_PO_SUBDIRS
 AM_GNU_GETTEXT_VERSION([0.16.1])
 if test "$try_gettext" = yes; then
-  AM_GNU_GETTEXT(,[need-ngettext])
+  AM_ICONV
+  AM_GNU_GETTEXT([external],[need-ngettext])
 
   # gettext requires some extra checks.  These really should be part of
   # the basic AM_GNU_GETTEXT macro.  TODO: move other gettext-specific
@@ -1350,7 +1349,6 @@ fi
 AC_CONFIG_FILES([ m4/Makefile 
 Makefile
 po/Makefile.in
-intl/Makefile
 gl/Makefile
 include/Makefile
 jnlib/Makefile
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7123c5d71..ec629cbaa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* gpl.texi: Updated to GPLv3.
+
 2007-06-22  Werner Koch  <[email protected]>
 
 	* gpg.texi (Operational GPG Commands): Describe the flags used by
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a3e019e95..3d84bb814 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/doc/README.W32 b/doc/README.W32
deleted file mode 100644
index 6417e90cb..000000000
--- a/doc/README.W32
+++ /dev/null
@@ -1,42 +0,0 @@
-                         README.W32 
-                        ============
-                         2004-12-22
-
-  This is a precompiled version of gnupg 1.9.14 for MS Windows.
-  Please see the manual (gnupg.pdf) for the current limitations.  Be
-  aware that this is the first released version and thus bugs are
-  pretty likely.
-
-  Please copy all files to the directory c:\gnupg and follow the
-  manual instructions.
-  
-  This software has been build using Debian's mingw package, version
-  3.3.1.20030804.1-1.  Libraries are all compiled statically, versions
-  of the used libraries are:
-  
-   gpg-error-config: 1.1-cvs
-   libgcrypt-config: 1.2.1-cvs
-   ksba-config: 0.9.11-cvs
-   libassuan-config: 0.6.9-cvs
-  
-  as these are all CVS versions you need to get the from the CVS.  See
-  www.gnupg.org for details.  Use 2004-12-22 18:00 UTC as revision
-  date.  The source code of GnuPG itsself is available at
-  ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2
-  ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig
-  
-  Building has been done by running the command
-  
-   ./autogen.sh --build-w32
-  
-  for all these libraries and then for gnupg.  The PDF file has been
-  produced by first converting the logo file to pdf and the running
-  "make gnupg.pdf" in the doc directory.  All executables have been
-  stripped.
-  
-  In case of questions please contact us at [email protected] or better
-  write to the mailing list [email protected].
-  
-  Thanks,
-  
-    The g10 Code team  
diff --git a/doc/gnupg-card-architecture.fig b/doc/gnupg-card-architecture.fig
index 49351c720..0efa362c5 100644
--- a/doc/gnupg-card-architecture.fig
+++ b/doc/gnupg-card-architecture.fig
@@ -5,7 +5,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
 Landscape
 Center
 Metric
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index f7dfdb42f..6f3f0b74e 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -39,7 +39,7 @@ Copyright @copyright{} 2002, 2004, 2005, 2006, 2007 Free Software Foundation, In
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 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
+Free Software Foundation; either version 3 of the License, or (at your
 option) any later version. The text of the license can be found in the
 section entitled ``Copying''.
 @end quotation
diff --git a/doc/gpl.texi b/doc/gpl.texi
index 00108d230..7f9a48a13 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -1,321 +1,663 @@
 @node Copying
-@appendix GNU GENERAL PUBLIC LICENSE
 
-@cindex GPL, GNU General Public License
-@center Version 2, June 1991
+@unnumbered GNU General Public License
+@center Version 3, 29 June 2007
+
+@c This file is intended to be included in another file.
 
 @display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 @end display
 
-@appendixsubsec Preamble
+@unnumberedsec Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users.  We, the Free Software Foundation,
+use the GNU General Public License for most of our software; it
+applies also to any other work released this way by its authors.  You
+can apply it to your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too,
+receive or can get the source code.  And you must show them these
+terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary.  To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
 modification follow.
 
 @iftex
-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@unnumberedsec TERMS AND CONDITIONS
 @end iftex
 @ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@center TERMS AND CONDITIONS
 @end ifinfo
 
-@enumerate
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+@enumerate 0
+@item Definitions.
+
+``This License'' refers to version 3 of the GNU General Public License.
+
+``Copyright'' also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+``The Program'' refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as ``you''.  ``Licensees'' and
+``recipients'' may be individuals or organizations.
+
+To ``modify'' a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy.  The resulting work is called a ``modified version'' of
+the earlier work or a work ``based on'' the earlier work.
+
+A ``covered work'' means either the unmodified Program or a work based
+on the Program.
+
+To ``propagate'' a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To ``convey'' a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays ``Appropriate Legal Notices'' to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+@item Source Code.
+
+The ``source code'' for a work means the preferred form of the work for
+making modifications to it.  ``Object code'' means any non-source form
+of a work.
+
+A ``Standard Interface'' means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The ``System Libraries'' of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+``Major Component'', in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The ``Corresponding Source'' for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+@item Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright.  Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+@item Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+@item Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+@item Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
 
 @enumerate a
+@item 
+The work must carry prominent notices stating that you modified it,
+and giving a relevant date.
+
 @item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
+The work must carry prominent notices stating that it is released
+under this License and any conditions added under section 7.  This
+requirement modifies the requirement in section 4 to ``keep intact all
+notices''.
 
 @item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
+You must license the entire work, as a whole, under this License to
+anyone who comes into possession of a copy.  This License will
+therefore apply, along with any applicable section 7 additional terms,
+to the whole of the work, and all its parts, regardless of how they
+are packaged.  This License gives no permission to license the work in
+any other way, but it does not invalidate such permission if you have
+separately received it.
 
 @item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
+If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your work
+need not make them do so.
 @end enumerate
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+``aggregate'' if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-@item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+@item  Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
 
 @enumerate a
 @item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium customarily
+used for software interchange.
 
 @item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a written
+offer, valid for at least three years and valid for as long as you
+offer spare parts or customer support for that product model, to give
+anyone who possesses the object code either (1) a copy of the
+Corresponding Source for all the software in the product that is
+covered by this License, on a durable physical medium customarily used
+for software interchange, for a price no more than your reasonable
+cost of physically performing this conveying of source, or (2) access
+to copy the Corresponding Source from a network server at no charge.
 
 @item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
+Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source.  This alternative is
+allowed only occasionally and noncommercially, and only if you
+received the object code with such an offer, in accord with subsection
+6b.
+
+@item
+Convey the object code by offering access from a designated place
+(gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to copy
+the object code is a network server, the Corresponding Source may be
+on a different server (operated by you or a third party) that supports
+equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source.
+Regardless of what server hosts the Corresponding Source, you remain
+obligated to ensure that it is available for as long as needed to
+satisfy these requirements.
+
+@item
+Convey the object code using peer-to-peer transmission, provided you
+inform other peers where the object code and Corresponding Source of
+the work are being offered to the general public at no charge under
+subsection 6d.
+
 @end enumerate
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A ``User Product'' is either (1) a ``consumer product'', which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling.  In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage.  For a particular product received by a particular user,
+``normally used'' refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+``Installation Information'' for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source.  The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed.  Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+@item Additional Terms.
+
+``Additional permissions'' are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
 
+@enumerate a
 @item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+Disclaiming warranty or limiting liability differently from the terms
+of sections 15 and 16 of this License; or
 
 @item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices
+displayed by works containing it; or
 
 @item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
+Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
 
 @item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
 
 @item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+Declining to grant rights under trademark law for use of some trade
+names, trademarks, or service marks; or
 
 @item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with
+contractual assumptions of liability to the recipient, for any
+liability that these contractual assumptions directly impose on those
+licensors and authors.
+@end enumerate
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+All other non-permissive additional terms are considered ``further
+restrictions'' within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+@item Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+@item Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+@item Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An ``entity transaction'' is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+@item Patents.
+
+A ``contributor'' is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's ``contributor version''.
+
+A contributor's ``essential patent claims'' are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, ``control'' includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
 
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a ``patent license'' is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To ``grant'' such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  ``Knowingly relying'' means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is ``discriminatory'' if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License.  You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+@item No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey
+a covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all.  For example, if you agree
+to terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+@item Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+@item Revised Versions of this License.
 
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
 
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+Each version is given a distinguishing version number.  If the Program
+specifies that a certain numbered version of the GNU General Public
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation.  If
+the Program does not specify a version number of the GNU General
+Public License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+@item Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+@item Limitation of Liability.
 
-@item
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-@end enumerate
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+@item Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 @iftex
 @heading END OF TERMS AND CONDITIONS
@@ -323,75 +665,61 @@ POSSIBILITY OF SUCH DAMAGES.
 @ifinfo
 @center END OF TERMS AND CONDITIONS
 @end ifinfo
-
-@page
 @unnumberedsec How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+free software which everyone can redistribute and change under these
+terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
-
 @smallexample
-@var{one line to give the program's name and an idea of what it does.}
-Copyright (C) 19@var{yy}  @var{name of author}
-
-This program 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-@end smallexample
+@var{one line to give the program's name and a brief idea of what it does.}  
+Copyright (C) @var{year} @var{name of author}
 
-Also add information on how to contact you by electronic and paper mail.
+This program 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 3 of the License, or (at
+your option) any later version.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c' 
-for details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end smallexample
 
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
+Also add information on how to contact you by electronic and paper mail.
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
 @smallexample
-@group
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written 
-by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end group
+@var{program} Copyright (C) @var{year} @var{name of author} 
+This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
+This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
 @end smallexample
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+The hypothetical commands @samp{show w} and @samp{show c} should show
+the appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you would
+use an ``about box''.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a ``copyright disclaimer'' for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+@url{http://www.gnu.org/licenses/}.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.  But
+first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+
+@end enumerate
diff --git a/doc/yat2m.c b/doc/yat2m.c
index 4ead165ae..dbb198b82 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -4,7 +4,7 @@
  *
  * This program 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/g10/Makefile.am b/g10/Makefile.am
index defe80409..056ff9a97 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/g10/armor.c b/g10/armor.c
index 8f22f316c..1a9f82e89 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/build-packet.c b/g10/build-packet.c
index e6c9734e8..4c27823cd 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 57a45f6fb..55e7f24ff 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 6b27c7693..2a561be68 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_G10_CALL_AGENT_H
 #define GNUPG_G10_CALL_AGENT_H 
diff --git a/g10/card-util.c b/g10/card-util.c
index d05f61a62..9d1405baf 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/cipher.c b/g10/cipher.c
index 802c01905..fcd3965c3 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/comment.c b/g10/comment.c
index e19ed3994..d3dab2a9a 100644
--- a/g10/comment.c
+++ b/g10/comment.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index 90f826678..3c1c649b5 100644
--- a/g10/compress-bz2.c
+++ b/g10/compress-bz2.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/compress.c b/g10/compress.c
index 6c7463d46..a91dd2303 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Note that the code in compress-bz2.c is nearly identical to the
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 23c3f7419..6f429490f 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/decrypt.c b/g10/decrypt.c
index d5d62db27..2c0f25f57 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/delkey.c b/g10/delkey.c
index eca8068e0..5eb57e5f0 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/encode.c b/g10/encode.c
index 41bfafe3c..196d213d2 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/encr-data.c b/g10/encr-data.c
index 851233cde..a05ff468a 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/exec.c b/g10/exec.c
index 268a1a5d8..804437674 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/exec.h b/g10/exec.h
index 66d13c72b..51304adc0 100644
--- a/g10/exec.h
+++ b/g10/exec.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _EXEC_H_
diff --git a/g10/export.c b/g10/export.c
index a4514ae38..931f7ce75 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/filter.h b/g10/filter.h
index 13f6b38d5..923cfdadf 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_FILTER_H
 #define G10_FILTER_H
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 8aab06370..85f23ce3f 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/getkey.c b/g10/getkey.c
index 658a3b4ae..d0d9bf451 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/gpg.c b/g10/gpg.c
index 0eb21f079..a8563821c 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/gpg.h b/g10/gpg.h
index d47c58fe2..c828c6dce 100644
--- a/g10/gpg.h
+++ b/g10/gpg.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_G10_GPG_H
 #define GNUPG_G10_GPG_H 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 72ee53c4b..a2343ae85 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/helptext.c b/g10/helptext.c
index c720cc7cf..de5fca2c6 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/import.c b/g10/import.c
index 7978bbba0..a3d0fecb8 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/kbnode.c b/g10/kbnode.c
index b09546451..3d7d9be5c 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keydb.c b/g10/keydb.c
index 830c5127b..69e24aefc 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keydb.h b/g10/keydb.h
index 5cf1dd2ac..234d3d6d1 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_KEYDB_H
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 94c34e96e..68c21ee69 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keygen.c b/g10/keygen.c
index 2adb4cc01..c89cea718 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyid.c b/g10/keyid.c
index 0de396f16..89b2ddfe2 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keylist.c b/g10/keylist.c
index 95d452eea..adb32e76e 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyring.c b/g10/keyring.c
index 56acaa3ea..67ac018c6 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyring.h b/g10/keyring.h
index 773d7b492..584df409e 100644
--- a/g10/keyring.h
+++ b/g10/keyring.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPG_KEYRING_H
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 136f424e5..9f05c1880 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _KEYSERVER_INTERNAL_H_
diff --git a/g10/keyserver.c b/g10/keyserver.c
index ee11251b9..23497d819 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/main.h b/g10/main.h
index 69e0d95f5..fdbd93b63 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_MAIN_H
 #define G10_MAIN_H
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 4e76ab34d..1d5c03f00 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 06aa8386c..7a12269e0 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/misc.c b/g10/misc.c
index 4cb7191e5..2ffe7268d 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/openfile.c b/g10/openfile.c
index 949299ae7..55dd42c4b 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/options.h b/g10/options.h
index 3c8b5ac4a..5918d089e 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_OPTIONS_H
 #define G10_OPTIONS_H
diff --git a/g10/packet.h b/g10/packet.h
index d40c16031..9651ba4b0 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_PACKET_H
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 90201d6be..b1b01e515 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 2d904e5e1..ad085486b 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/photoid.c b/g10/photoid.c
index cca32bc82..f330f2eab 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/photoid.h b/g10/photoid.h
index d13669c52..88da4fb10 100644
--- a/g10/photoid.h
+++ b/g10/photoid.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Photo ID functions */
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 82abe3f0d..c94c0b297 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/pkglue.c b/g10/pkglue.c
index 3f9669d27..e4d749a23 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/pkglue.h b/g10/pkglue.h
index 866960bfd..89d2216b5 100644
--- a/g10/pkglue.h
+++ b/g10/pkglue.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_G10_PKGLUE_H
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 4e48ddfbb..027fe994c 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/progress.c b/g10/progress.c
index 8ccc4536f..d0aa926ed 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 777e5f788..e0ae55fd7 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/revoke.c b/g10/revoke.c
index 4d7b8c366..3a532b1d3 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 4a22a4524..f0dde2caf 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/server.c b/g10/server.c
index 9aa69ff6e..a5793c79a 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/seskey.c b/g10/seskey.c
index 6ac83b01f..b843530dc 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/sig-check.c b/g10/sig-check.c
index ac9d0da7d..55afde027 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/sign.c b/g10/sign.c
index 95ff96373..33830d0ce 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/signal.c b/g10/signal.c
index 6055b1c2c..3a0b438a4 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/skclist.c b/g10/skclist.c
index 5aeaa78ff..e0e1256d6 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/status.c b/g10/status.c
index 3e5de6e88..e78652482 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/status.h b/g10/status.h
index a7b789f99..0a2a9e0b6 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_STATUS_H
 #define G10_STATUS_H
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index d840c0882..2d69d9fbd 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.c b/g10/tdbio.c
index c6fe995df..563178f61 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.h b/g10/tdbio.h
index 80a70d9f4..d6af98fd0 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TDBIO_H
diff --git a/g10/textfilter.c b/g10/textfilter.c
index dc34aa244..34b12790f 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 573c12903..463096711 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 2d0581f9b..8c6721532 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TRUSTDB_H
diff --git a/g10/verify.c b/g10/verify.c
index 36df06f23..edaefcd0d 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/gl/alloca_.h b/gl/alloca_.h
index dd0b3e98f..cd13ed64c 100644
--- a/gl/alloca_.h
+++ b/gl/alloca_.h
@@ -5,7 +5,7 @@
 
    This program 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, or (at your option)
+   by the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,9 +14,8 @@
    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.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
    means there is a real alloca function.  */
diff --git a/gl/allocsa.c b/gl/allocsa.c
index 97652e688..243f0bf60 100644
--- a/gl/allocsa.c
+++ b/gl/allocsa.c
@@ -13,8 +13,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
diff --git a/gl/allocsa.h b/gl/allocsa.h
index f8c0bc0bd..4c2affef5 100644
--- a/gl/allocsa.h
+++ b/gl/allocsa.h
@@ -4,7 +4,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _ALLOCSA_H
 #define _ALLOCSA_H
diff --git a/gl/mkdtemp.c b/gl/mkdtemp.c
index c3460782a..4cf86a0cc 100644
--- a/gl/mkdtemp.c
+++ b/gl/mkdtemp.c
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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.  */
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/gl/mkdtemp.h b/gl/mkdtemp.h
index 617604801..d331f3e33 100644
--- a/gl/mkdtemp.h
+++ b/gl/mkdtemp.h
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #if HAVE_MKDTEMP
 
diff --git a/gl/setenv.c b/gl/setenv.c
index 23832485a..7c03d62b4 100644
--- a/gl/setenv.c
+++ b/gl/setenv.c
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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. */
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
diff --git a/gl/setenv.h b/gl/setenv.h
index c89e7da4d..59baefe7b 100644
--- a/gl/setenv.h
+++ b/gl/setenv.h
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #if HAVE_SETENV || HAVE_UNSETENV
 
diff --git a/gl/size_max.h b/gl/size_max.h
index ed0bc1377..a9a74e2c6 100644
--- a/gl/size_max.h
+++ b/gl/size_max.h
@@ -4,7 +4,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef GNULIB_SIZE_MAX_H
 #define GNULIB_SIZE_MAX_H
diff --git a/gl/stdint_.h b/gl/stdint_.h
index b0af52243..bc2759519 100644
--- a/gl/stdint_.h
+++ b/gl/stdint_.h
@@ -4,7 +4,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_STDINT_H
 #define _GL_STDINT_H
diff --git a/gl/strpbrk.c b/gl/strpbrk.c
index 7843a6dd6..0149257ef 100644
--- a/gl/strpbrk.c
+++ b/gl/strpbrk.c
@@ -6,7 +6,7 @@
 
    This program 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, or (at your option) any
+   Free Software Foundation; either version 3, or (at your option) any
    later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/gl/strpbrk.h b/gl/strpbrk.h
index acc8d358b..2c28556d8 100644
--- a/gl/strpbrk.h
+++ b/gl/strpbrk.h
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #if HAVE_STRPBRK
 
diff --git a/gl/unsetenv.c b/gl/unsetenv.c
index 0f837440d..76b707cad 100644
--- a/gl/unsetenv.c
+++ b/gl/unsetenv.c
@@ -3,7 +3,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
    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. */
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/gl/xsize.h b/gl/xsize.h
index 341fb16ca..17a608017 100644
--- a/gl/xsize.h
+++ b/gl/xsize.h
@@ -4,7 +4,7 @@
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    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.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _XSIZE_H
 #define _XSIZE_H
diff --git a/include/cipher.h b/include/cipher.h
index d8b15cf9a..9d2471a68 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_CIPHER_H
 #define G10_CIPHER_H
diff --git a/include/host2net.h b/include/host2net.h
index e378bfb29..50f4815ee 100644
--- a/include/host2net.h
+++ b/include/host2net.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_HOST2NET_H
diff --git a/include/types.h b/include/types.h
index 6abd500e3..8a861bc0a 100644
--- a/include/types.h
+++ b/include/types.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TYPES_H
diff --git a/include/zlib-riscos.h b/include/zlib-riscos.h
index 6a27b86ef..0f547d380 100644
--- a/include/zlib-riscos.h
+++ b/include/zlib-riscos.h
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_ZLIB_RISCOS_H
 #define G10_ZLIB_RISCOS_H
diff --git a/intl/ChangeLog b/intl/ChangeLog
deleted file mode 100644
index a1e3707ed..000000000
--- a/intl/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-11-27  GNU  <[email protected]>
-
-	* Version 0.16.1 released.
-
diff --git a/intl/Makefile.in b/intl/Makefile.in
deleted file mode 100644
index 525922e11..000000000
--- a/intl/Makefile.in
+++ /dev/null
@@ -1,562 +0,0 @@
-# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library 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.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-
-# The VPATH variables allows builds with $builddir != $srcdir, assuming a
-# 'make' program that supports VPATH (such as GNU make). This line is removed
-# by autoconf automatically when "$(srcdir)" = ".".
-# In this directory, the VPATH handling is particular:
-# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
-#    the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
-# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
-#    'make' does the wrong thing if GNU gettext was configured with
-#    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
-#    files it finds in srcdir = ../../gettext-runtime/intl.
-VPATH = $(srcdir)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
-
-# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
-# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
--Dset_relocation_prefix=libintl_set_relocation_prefix \
--Drelocate=libintl_relocate \
--DDEPENDS_ON_LIBICONV=1 @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@
-LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@)
-LDFLAGS_yes = -Wl,--export-all-symbols
-LDFLAGS_no =
-LIBS = @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = \
-  gmo.h \
-  gettextP.h \
-  hash-string.h \
-  loadinfo.h \
-  plural-exp.h \
-  eval-plural.h \
-  localcharset.h \
-  lock.h \
-  relocatable.h \
-  xsize.h \
-  printf-args.h printf-args.c \
-  printf-parse.h wprintf-parse.h printf-parse.c \
-  vasnprintf.h vasnwprintf.h vasnprintf.c \
-  os2compat.h \
-  libgnuintl.h.in
-SOURCES = \
-  bindtextdom.c \
-  dcgettext.c \
-  dgettext.c \
-  gettext.c \
-  finddomain.c \
-  hash-string.c \
-  loadmsgcat.c \
-  localealias.c \
-  textdomain.c \
-  l10nflist.c \
-  explodename.c \
-  dcigettext.c \
-  dcngettext.c \
-  dngettext.c \
-  ngettext.c \
-  plural.y \
-  plural-exp.c \
-  localcharset.c \
-  lock.c \
-  relocatable.c \
-  langprefs.c \
-  localename.c \
-  log.c \
-  printf.c \
-  version.c \
-  osdep.c \
-  os2compat.c \
-  intl-exports.c \
-  intl-compat.c
-OBJECTS = \
-  bindtextdom.$lo \
-  dcgettext.$lo \
-  dgettext.$lo \
-  gettext.$lo \
-  finddomain.$lo \
-  hash-string.$lo \
-  loadmsgcat.$lo \
-  localealias.$lo \
-  textdomain.$lo \
-  l10nflist.$lo \
-  explodename.$lo \
-  dcigettext.$lo \
-  dcngettext.$lo \
-  dngettext.$lo \
-  ngettext.$lo \
-  plural.$lo \
-  plural-exp.$lo \
-  localcharset.$lo \
-  lock.$lo \
-  relocatable.$lo \
-  langprefs.$lo \
-  localename.$lo \
-  log.$lo \
-  printf.$lo \
-  version.$lo \
-  osdep.$lo \
-  intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin export.h \
-$(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
-libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
-libgnuintl.h.msvc-shared Makefile.msvc
-
-all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
-
-libintl.a libgnuintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=8
-LTV_REVISION=1
-LTV_AGE=0
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-
-.c.o:
-	$(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-bindtextdom.lo: $(srcdir)/bindtextdom.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
-dcgettext.lo: $(srcdir)/dcgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
-dgettext.lo: $(srcdir)/dgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
-gettext.lo: $(srcdir)/gettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
-finddomain.lo: $(srcdir)/finddomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
-hash-string.lo: $(srcdir)/hash-string.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c
-loadmsgcat.lo: $(srcdir)/loadmsgcat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
-localealias.lo: $(srcdir)/localealias.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
-textdomain.lo: $(srcdir)/textdomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
-l10nflist.lo: $(srcdir)/l10nflist.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
-explodename.lo: $(srcdir)/explodename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
-dcigettext.lo: $(srcdir)/dcigettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
-dcngettext.lo: $(srcdir)/dcngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
-dngettext.lo: $(srcdir)/dngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
-ngettext.lo: $(srcdir)/ngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
-plural.lo: $(srcdir)/plural.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
-plural-exp.lo: $(srcdir)/plural-exp.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
-localcharset.lo: $(srcdir)/localcharset.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
-lock.lo: $(srcdir)/lock.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c
-relocatable.lo: $(srcdir)/relocatable.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
-langprefs.lo: $(srcdir)/langprefs.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
-localename.lo: $(srcdir)/localename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
-log.lo: $(srcdir)/log.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
-printf.lo: $(srcdir)/printf.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
-version.lo: $(srcdir)/version.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c
-osdep.lo: $(srcdir)/osdep.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
-intl-compat.lo: $(srcdir)/intl-compat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
-
-ref-add.sed: $(srcdir)/ref-add.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
-	mv t-ref-add.sed ref-add.sed
-ref-del.sed: $(srcdir)/ref-del.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
-	mv t-ref-del.sed ref-del.sed
-
-INCLUDES = -I. -I$(srcdir) -I..
-
-libgnuintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e '/IN_LIBGLOCALE/d' \
-	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
-	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
-	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
-	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in \
-	| if test '@WOE32DLL@' = yes; then \
-	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
-	  else \
-	    cat; \
-	  fi \
-	| sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \
-	      -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \
-	| sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \
-	  > libgnuintl.h
-
-libintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e '/IN_LIBGLOCALE/d' \
-	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
-	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
-	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
-	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in > libintl.h
-
-charset.alias: $(srcdir)/config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
-
-check: all
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	  if test "@RELOCATABLE@" = yes; then \
-	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
-	    if test -n "$$dependencies"; then \
-	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
-	    fi; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir); \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
-	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
-	  fi; \
-	  $(mkdir_p) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-install-strip: install
-
-installdirs:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir); \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
-	  $(mkdir_p) $(DESTDIR)$(localedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-info dvi ps pdf html:
-
-$(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
-dcigettext.$lo: $(srcdir)/eval-plural.h
-localcharset.$lo: $(srcdir)/localcharset.h
-bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
-
-# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
-PLURAL_DEPS_yes = libintl.h
-PLURAL_DEPS_no =
-plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@)
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-ctags: CTAGS
-
-CTAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.la *.o *.obj *.lo core core.*
-	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  : ; \
-	else \
-	  if test "$(PACKAGE)" = "gettext-runtime"; then \
-	    additional="$(DISTFILES.gettext)"; \
-	  else \
-	    additional="$(DISTFILES.normal)"; \
-	  fi; \
-	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
-	  done; \
-	fi
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status
-# This would be more efficient, but doesn't work any more with autoconf-2.57,
-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
-#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/intl/VERSION b/intl/VERSION
deleted file mode 100644
index 2525c4ea8..000000000
--- a/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.16.1
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
deleted file mode 100644
index d1b1f9028..000000000
--- a/intl/bindtextdom.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-# define gl_rwlock_define __libc_rwlock_define
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
-#else
-# include "lock.h"
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname libintl_nl_default_dirname
-# define _nl_domain_bindings libintl_nl_domain_bindings
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-#ifdef _LIBC
-libc_hidden_proto (_nl_default_dirname)
-#endif
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN libintl_bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
-#endif
-
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (const char *domainname,
-		    const char **dirnamep, const char **codesetp)
-{
-  struct binding *binding;
-  int modified;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  gl_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding != NULL)
-    {
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
-#if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
-#else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
-#endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
-	    }
-	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
-      struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
-
-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
-
-      memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
-#endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
-	new_binding->dirname = (char *) _nl_default_dirname;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
-      else
-	new_binding->codeset = NULL;
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
-    }
-
-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  gl_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (const char *domainname, const char *dirname)
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
-}
-
-#ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
-#endif
diff --git a/intl/config.charset b/intl/config.charset
deleted file mode 100755
index e8c258b3f..000000000
--- a/intl/config.charset
+++ /dev/null
@@ -1,640 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-#   Copyright (C) 2000-2004, 2006 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# The table consists of lines of the form
-#    ALIAS  CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-#       name              MIME?             used by which systems
-#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin
-#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-#   ISO-8859-3              Y   glibc solaris
-#   ISO-8859-4              Y   osf solaris freebsd netbsd darwin
-#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-#   ISO-8859-6              Y   glibc aix hpux solaris
-#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd darwin
-#   ISO-8859-8              Y   glibc aix hpux osf solaris
-#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin
-#   ISO-8859-13                 glibc netbsd darwin
-#   ISO-8859-14                 glibc
-#   ISO-8859-15                 glibc aix osf solaris freebsd darwin
-#   KOI8-R                  Y   glibc solaris freebsd netbsd darwin
-#   KOI8-U                  Y   glibc freebsd netbsd darwin
-#   KOI8-T                      glibc
-#   CP437                       dos
-#   CP775                       dos
-#   CP850                       aix osf dos
-#   CP852                       dos
-#   CP855                       dos
-#   CP856                       aix
-#   CP857                       dos
-#   CP861                       dos
-#   CP862                       dos
-#   CP864                       dos
-#   CP865                       dos
-#   CP866                       freebsd netbsd darwin dos
-#   CP869                       dos
-#   CP874                       woe32 dos
-#   CP922                       aix
-#   CP932                       aix woe32 dos
-#   CP943                       aix
-#   CP949                       osf woe32 dos
-#   CP950                       woe32 dos
-#   CP1046                      aix
-#   CP1124                      aix
-#   CP1125                      dos
-#   CP1129                      aix
-#   CP1250                      woe32
-#   CP1251                      glibc solaris netbsd darwin woe32
-#   CP1252                      aix woe32
-#   CP1253                      woe32
-#   CP1254                      woe32
-#   CP1255                      glibc woe32
-#   CP1256                      woe32
-#   CP1257                      woe32
-#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
-#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
-#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin
-#   BIG5-HKSCS                  glibc solaris
-#   GBK                         glibc aix osf solaris woe32 dos
-#   GB18030                     glibc solaris netbsd
-#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
-#   JOHAB                       glibc solaris woe32
-#   TIS-620                     glibc aix hpux osf solaris
-#   VISCII                  Y   glibc
-#   TCVN5712-1                  glibc
-#   GEORGIAN-PS                 glibc
-#   HP-ROMAN8                   hpux
-#   HP-ARABIC8                  hpux
-#   HP-GREEK8                   hpux
-#   HP-HEBREW8                  hpux
-#   HP-TURKISH8                 hpux
-#   HP-KANA8                    hpux
-#   DEC-KANJI                   osf
-#   DEC-HANYU                   osf
-#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
-    linux-gnulibc1*)
-	# Linux libc5 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "C ASCII"
-	echo "POSIX ASCII"
-	for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
-	         en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
-	         en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
-	         es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
-	         et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
-	         fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
-	         it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
-	         sv_FI sv_SE; do
-	  echo "$l ISO-8859-1"
-	  echo "$l.iso-8859-1 ISO-8859-1"
-	  echo "$l.iso-8859-15 ISO-8859-15"
-	  echo "$l.iso-8859-15@euro ISO-8859-15"
-	  echo "$l@euro ISO-8859-15"
-	  echo "$l.cp-437 CP437"
-	  echo "$l.cp-850 CP850"
-	  echo "$l.cp-1252 CP1252"
-	  echo "$l.cp-1252@euro CP1252"
-	  #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
-	  echo "$l.utf-8 UTF-8"
-	  echo "$l.utf-8@euro UTF-8"
-	done
-	for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
-	         sl_SI sr sr_CS sr_YU; do
-	  echo "$l ISO-8859-2"
-	  echo "$l.iso-8859-2 ISO-8859-2"
-	  echo "$l.cp-852 CP852"
-	  echo "$l.cp-1250 CP1250"
-	  echo "$l.utf-8 UTF-8"
-	done
-	for l in mk mk_MK ru ru_RU; do
-	  echo "$l ISO-8859-5"
-	  echo "$l.iso-8859-5 ISO-8859-5"
-	  echo "$l.koi8-r KOI8-R"
-	  echo "$l.cp-866 CP866"
-	  echo "$l.cp-1251 CP1251"
-	  echo "$l.utf-8 UTF-8"
-	done
-	for l in ar ar_SA; do
-	  echo "$l ISO-8859-6"
-	  echo "$l.iso-8859-6 ISO-8859-6"
-	  echo "$l.cp-864 CP864"
-	  #echo "$l.cp-868 CP868" # not a commonly used encoding
-	  echo "$l.cp-1256 CP1256"
-	  echo "$l.utf-8 UTF-8"
-	done
-	for l in el el_GR gr gr_GR; do
-	  echo "$l ISO-8859-7"
-	  echo "$l.iso-8859-7 ISO-8859-7"
-	  echo "$l.cp-869 CP869"
-	  echo "$l.cp-1253 CP1253"
-	  echo "$l.cp-1253@euro CP1253"
-	  echo "$l.utf-8 UTF-8"
-	  echo "$l.utf-8@euro UTF-8"
-	done
-	for l in he he_IL iw iw_IL; do
-	  echo "$l ISO-8859-8"
-	  echo "$l.iso-8859-8 ISO-8859-8"
-	  echo "$l.cp-862 CP862"
-	  echo "$l.cp-1255 CP1255"
-	  echo "$l.utf-8 UTF-8"
-	done
-	for l in tr tr_TR; do
-	  echo "$l ISO-8859-9"
-	  echo "$l.iso-8859-9 ISO-8859-9"
-	  echo "$l.cp-857 CP857"
-	  echo "$l.cp-1254 CP1254"
-	  echo "$l.utf-8 UTF-8"
-	done
-	for l in lt lt_LT lv lv_LV; do
-	  #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
-	  echo "$l ISO-8859-13"
-	done
-	for l in ru_UA uk uk_UA; do
-	  echo "$l KOI8-U"
-	done
-	for l in zh zh_CN; do
-	  #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
-	  echo "$l GB2312"
-	done
-	for l in ja ja_JP ja_JP.EUC; do
-	  echo "$l EUC-JP"
-	done
-	for l in ko ko_KR; do
-	  echo "$l EUC-KR"
-	done
-	for l in th th_TH; do
-	  echo "$l TIS-620"
-	done
-	for l in fa fa_IR; do
-	  #echo "$l ISIRI-3342" # a broken encoding
-	  echo "$l.utf-8 UTF-8"
-	done
-	;;
-    linux* | *-gnu*)
-	# With glibc-2.1 or newer, we don't need any canonicalization,
-	# because glibc has iconv and both glibc and libiconv support all
-	# GNU canonical names directly. Therefore, the Makefile does not
-	# need to install the alias file at all.
-	# The following applies only to glibc-2.0.x and older libcs.
-	echo "ISO_646.IRV:1983 ASCII"
-	;;
-    aix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "IBM-850 CP850"
-	echo "IBM-856 CP856"
-	echo "IBM-921 ISO-8859-13"
-	echo "IBM-922 CP922"
-	echo "IBM-932 CP932"
-	echo "IBM-943 CP943"
-	echo "IBM-1046 CP1046"
-	echo "IBM-1124 CP1124"
-	echo "IBM-1129 CP1129"
-	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN GB2312"
-	echo "IBM-eucJP EUC-JP"
-	echo "IBM-eucKR EUC-KR"
-	echo "IBM-eucTW EUC-TW"
-	echo "big5 BIG5"
-	echo "GBK GBK"
-	echo "TIS-620 TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    hpux*)
-	echo "iso88591 ISO-8859-1"
-	echo "iso88592 ISO-8859-2"
-	echo "iso88595 ISO-8859-5"
-	echo "iso88596 ISO-8859-6"
-	echo "iso88597 ISO-8859-7"
-	echo "iso88598 ISO-8859-8"
-	echo "iso88599 ISO-8859-9"
-	echo "iso885915 ISO-8859-15"
-	echo "roman8 HP-ROMAN8"
-	echo "arabic8 HP-ARABIC8"
-	echo "greek8 HP-GREEK8"
-	echo "hebrew8 HP-HEBREW8"
-	echo "turkish8 HP-TURKISH8"
-	echo "kana8 HP-KANA8"
-	echo "tis620 TIS-620"
-	echo "big5 BIG5"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "hp15CN GB2312"
-	#echo "ccdc ?" # what is this?
-	echo "SJIS SHIFT_JIS"
-	echo "utf8 UTF-8"
-	;;
-    irix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	;;
-    osf*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "cp850 CP850"
-	echo "big5 BIG5"
-	echo "dechanyu DEC-HANYU"
-	echo "dechanzi GB2312"
-	echo "deckanji DEC-KANJI"
-	echo "deckorean EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "GBK GBK"
-	echo "KSC5601 CP949"
-	echo "sdeckanji EUC-JP"
-	echo "SJIS SHIFT_JIS"
-	echo "TACTIS TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    solaris*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-3 ISO-8859-3"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "koi8-r KOI8-R"
-	echo "ansi-1251 CP1251"
-	echo "BIG5 BIG5"
-	echo "Big5-HKSCS BIG5-HKSCS"
-	echo "gb2312 GB2312"
-	echo "GBK GBK"
-	echo "GB18030 GB18030"
-	echo "cns11643 EUC-TW"
-	echo "5601 EUC-KR"
-	echo "ko_KR.johap92 JOHAB"
-	echo "eucJP EUC-JP"
-	echo "PCK SHIFT_JIS"
-	echo "TIS620.2533 TIS-620"
-	#echo "sun_eu_greek ?" # what is this?
-	echo "UTF-8 UTF-8"
-	;;
-    freebsd* | os2*)
-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
-	# reuse FreeBSD's locale data for OS/2.
-	echo "C ASCII"
-	echo "US-ASCII ASCII"
-	for l in la_LN lt_LN; do
-	  echo "$l.ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l.ISO_8859-1 ISO-8859-1"
-	  echo "$l.DIS_8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-	  echo "$l.ISO_8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO_8859-4 ISO-8859-4"
-	done
-	for l in ru_RU ru_SU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO_8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SHIFT_JIS"
-	echo "ja_JP.Shift_JIS SHIFT_JIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    netbsd*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-13 ISO-8859-13"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "BIG5 BIG5"
-	echo "SJIS SHIFT_JIS"
-	;;
-    darwin[56]*)
-	# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "C ASCII"
-	for l in en_AU en_CA en_GB en_US la_LN; do
-	  echo "$l.US-ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
-	         nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l ISO-8859-1"
-	  echo "$l.ISO8859-1 ISO-8859-1"
-	  echo "$l.ISO8859-15 ISO-8859-15"
-	done
-	for l in la_LN; do
-	  echo "$l.ISO8859-1 ISO-8859-1"
-	  echo "$l.ISO8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
-	  echo "$l.ISO8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO8859-4 ISO-8859-4"
-	done
-	for l in ru_RU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	for l in bg_BG; do
-	  echo "$l.CP1251 CP1251"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SHIFT_JIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    darwin*)
-	# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
-	# - It returns the empty string when LANG is set to a locale of the
-	#   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
-	#   LC_CTYPE file.
-	# - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
-	#   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
-	# - The documentation says:
-	#     "... all code that calls BSD system routines should ensure
-	#      that the const *char parameters of these routines are in UTF-8
-	#      encoding. All BSD system functions expect their string
-	#      parameters to be in UTF-8 encoding and nothing else."
-	#   It also says
-	#     "An additional caveat is that string parameters for files,
-	#      paths, and other file-system entities must be in canonical
-	#      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
-	#      characters are decomposed ..."
-	#   but this is not true: You can pass non-decomposed UTF-8 strings
-	#   to file system functions, and it is the OS which will convert
-	#   them to decomposed UTF-8 before accessing the file system.
-	# - The Apple Terminal application displays UTF-8 by default.
-	# - However, other applications are free to use different encodings:
-	#   - xterm uses ISO-8859-1 by default.
-	#   - TextEdit uses MacRoman by default.
-	# We prefer UTF-8 over decomposed UTF-8-MAC because one should
-	# minimize the use of decomposed Unicode. Unfortunately, through the
-	# Darwin file system, decomposed UTF-8 strings are leaked into user
-	# space nevertheless.
-	echo "* UTF-8"
-	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "* UTF-8"
-	;;
-    msdosdjgpp*)
-	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "#"
-	echo "# The encodings given here may not all be correct."
-	echo "# If you find that the encoding given for your language and"
-	echo "# country is not the one your DOS machine actually uses, just"
-	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <[email protected]>"
-	echo "# and Bruno Haible <[email protected]>."
-	echo "#"
-	echo "C ASCII"
-	# ISO-8859-1 languages
-	echo "ca CP850"
-	echo "ca_ES CP850"
-	echo "da CP865"    # not CP850 ??
-	echo "da_DK CP865" # not CP850 ??
-	echo "de CP850"
-	echo "de_AT CP850"
-	echo "de_CH CP850"
-	echo "de_DE CP850"
-	echo "en CP850"
-	echo "en_AU CP850" # not CP437 ??
-	echo "en_CA CP850"
-	echo "en_GB CP850"
-	echo "en_NZ CP437"
-	echo "en_US CP437"
-	echo "en_ZA CP850" # not CP437 ??
-	echo "es CP850"
-	echo "es_AR CP850"
-	echo "es_BO CP850"
-	echo "es_CL CP850"
-	echo "es_CO CP850"
-	echo "es_CR CP850"
-	echo "es_CU CP850"
-	echo "es_DO CP850"
-	echo "es_EC CP850"
-	echo "es_ES CP850"
-	echo "es_GT CP850"
-	echo "es_HN CP850"
-	echo "es_MX CP850"
-	echo "es_NI CP850"
-	echo "es_PA CP850"
-	echo "es_PY CP850"
-	echo "es_PE CP850"
-	echo "es_SV CP850"
-	echo "es_UY CP850"
-	echo "es_VE CP850"
-	echo "et CP850"
-	echo "et_EE CP850"
-	echo "eu CP850"
-	echo "eu_ES CP850"
-	echo "fi CP850"
-	echo "fi_FI CP850"
-	echo "fr CP850"
-	echo "fr_BE CP850"
-	echo "fr_CA CP850"
-	echo "fr_CH CP850"
-	echo "fr_FR CP850"
-	echo "ga CP850"
-	echo "ga_IE CP850"
-	echo "gd CP850"
-	echo "gd_GB CP850"
-	echo "gl CP850"
-	echo "gl_ES CP850"
-	echo "id CP850"    # not CP437 ??
-	echo "id_ID CP850" # not CP437 ??
-	echo "is CP861"    # not CP850 ??
-	echo "is_IS CP861" # not CP850 ??
-	echo "it CP850"
-	echo "it_CH CP850"
-	echo "it_IT CP850"
-	echo "lt CP775"
-	echo "lt_LT CP775"
-	echo "lv CP775"
-	echo "lv_LV CP775"
-	echo "nb CP865"    # not CP850 ??
-	echo "nb_NO CP865" # not CP850 ??
-	echo "nl CP850"
-	echo "nl_BE CP850"
-	echo "nl_NL CP850"
-	echo "nn CP865"    # not CP850 ??
-	echo "nn_NO CP865" # not CP850 ??
-	echo "no CP865"    # not CP850 ??
-	echo "no_NO CP865" # not CP850 ??
-	echo "pt CP850"
-	echo "pt_BR CP850"
-	echo "pt_PT CP850"
-	echo "sv CP850"
-	echo "sv_SE CP850"
-	# ISO-8859-2 languages
-	echo "cs CP852"
-	echo "cs_CZ CP852"
-	echo "hr CP852"
-	echo "hr_HR CP852"
-	echo "hu CP852"
-	echo "hu_HU CP852"
-	echo "pl CP852"
-	echo "pl_PL CP852"
-	echo "ro CP852"
-	echo "ro_RO CP852"
-	echo "sk CP852"
-	echo "sk_SK CP852"
-	echo "sl CP852"
-	echo "sl_SI CP852"
-	echo "sq CP852"
-	echo "sq_AL CP852"
-	echo "sr CP852"    # CP852 or CP866 or CP855 ??
-	echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
-	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-	# ISO-8859-3 languages
-	echo "mt CP850"
-	echo "mt_MT CP850"
-	# ISO-8859-5 languages
-	echo "be CP866"
-	echo "be_BE CP866"
-	echo "bg CP866"    # not CP855 ??
-	echo "bg_BG CP866" # not CP855 ??
-	echo "mk CP866"    # not CP855 ??
-	echo "mk_MK CP866" # not CP855 ??
-	echo "ru CP866"
-	echo "ru_RU CP866"
-	echo "uk CP1125"
-	echo "uk_UA CP1125"
-	# ISO-8859-6 languages
-	echo "ar CP864"
-	echo "ar_AE CP864"
-	echo "ar_DZ CP864"
-	echo "ar_EG CP864"
-	echo "ar_IQ CP864"
-	echo "ar_IR CP864"
-	echo "ar_JO CP864"
-	echo "ar_KW CP864"
-	echo "ar_MA CP864"
-	echo "ar_OM CP864"
-	echo "ar_QA CP864"
-	echo "ar_SA CP864"
-	echo "ar_SY CP864"
-	# ISO-8859-7 languages
-	echo "el CP869"
-	echo "el_GR CP869"
-	# ISO-8859-8 languages
-	echo "he CP862"
-	echo "he_IL CP862"
-	# ISO-8859-9 languages
-	echo "tr CP857"
-	echo "tr_TR CP857"
-	# Japanese
-	echo "ja CP932"
-	echo "ja_JP CP932"
-	# Chinese
-	echo "zh_CN GBK"
-	echo "zh_TW CP950" # not CP938 ??
-	# Korean
-	echo "kr CP949"    # not CP934 ??
-	echo "kr_KR CP949" # not CP934 ??
-	# Thai
-	echo "th CP874"
-	echo "th_TH CP874"
-	# Other
-	echo "eo CP850"
-	echo "eo_EO CP850"
-	;;
-esac
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
deleted file mode 100644
index c2a63f08e..000000000
--- a/intl/dcgettext.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCGETTEXT libintl_dcgettext
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (const char *domainname, const char *msgid, int category)
-{
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-INTDEF(__dcgettext)
-weak_alias (__dcgettext, dcgettext);
-#endif
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
deleted file mode 100644
index 583976821..000000000
--- a/intl/dcigettext.c
+++ /dev/null
@@ -1,1654 +0,0 @@
-/* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* NL_LOCALE_NAME does not work in glibc-2.4.  Ignore it.  */
-#undef HAVE_NL_LOCALE_NAME
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include <locale.h>
-
-#ifdef _LIBC
-  /* Guess whether integer division by zero raises signal SIGFPE.
-     Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
-# if defined __alpha__ || defined __arm__ || defined __i386__ \
-     || defined __m68k__ || defined __s390__
-#  define INTDIV0_RAISES_SIGFPE 1
-# else
-#  define INTDIV0_RAISES_SIGFPE 0
-# endif
-#endif
-#if !INTDIV0_RAISES_SIGFPE
-# include <signal.h>
-#endif
-
-#if defined HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-
-#if !defined _LIBC && HAVE_NL_LOCALE_NAME
-# include <langinfo.h>
-#endif
-
-#include "gettextP.h"
-#include "plural-exp.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# ifdef IN_LIBGLOCALE
-#  include <libintl.h>
-# endif
-# include "libgnuintl.h"
-#endif
-#include "hash-string.h"
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-# define gl_rwlock_define_initialized __libc_rwlock_define_initialized
-# define gl_rwlock_rdlock __libc_rwlock_rdlock
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
-#else
-# include "lock.h"
-#endif
-
-/* Alignment of types.  */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define alignof(TYPE) __alignof__ (TYPE)
-#else
-# define alignof(TYPE) \
-    ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain libintl_nl_default_default_domain
-# define _nl_current_default_domain libintl_nl_current_default_domain
-# define _nl_default_dirname libintl_nl_default_dirname
-# define _nl_domain_bindings libintl_nl_domain_bindings
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-# define tfind __tfind
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-#  if VMS
-#   define getcwd(buf, max) (getcwd) (buf, max, 0)
-#  else
-char *getcwd ();
-#  endif
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
-# endif
-# ifndef HAVE_MEMPCPY
-static void *mempcpy (void *dest, const void *src, size_t n);
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined PATH_MAX && defined _PC_PATH_MAX
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* Pathname support.
-   ISSLASH(C)           tests whether C is a directory separator character.
-   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
-                        it may be concatenated to a directory pathname.
-   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
-    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
-     && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-# define IS_PATH_WITH_DIR(P) \
-    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-#else
-  /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-#endif
-
-/* Whether to support different locales in different threads.  */
-#if defined _LIBC || HAVE_NL_LOCALE_NAME || (HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS) || defined IN_LIBGLOCALE
-# define HAVE_PER_THREAD_LOCALE
-#endif
-
-/* This is the type used for the search tree where known translations
-   are stored.  */
-struct known_translation_t
-{
-  /* Domain in which to search.  */
-  const char *domainname;
-
-  /* The category.  */
-  int category;
-
-#ifdef HAVE_PER_THREAD_LOCALE
-  /* Name of the relevant locale category, or "" for the global locale.  */
-  const char *localename;
-#endif
-
-#ifdef IN_LIBGLOCALE
-  /* The character encoding.  */
-  const char *encoding;
-#endif
-
-  /* State of the catalog counter at the point the string was found.  */
-  int counter;
-
-  /* Catalog where the string was found.  */
-  struct loaded_l10nfile *domain;
-
-  /* And finally the translation.  */
-  const char *translation;
-  size_t translation_length;
-
-  /* Pointer to the string in question.  */
-  char msgid[ZERO];
-};
-
-/* Root of the search tree with known translations.  We can use this
-   only if the system provides the `tsearch' function family.  */
-#if defined HAVE_TSEARCH || defined _LIBC
-# include <search.h>
-
-gl_rwlock_define_initialized (static, tree_lock)
-
-static void *root;
-
-# ifdef _LIBC
-#  define tsearch __tsearch
-# endif
-
-/* Function to compare two entries in the table of known translations.  */
-static int
-transcmp (const void *p1, const void *p2)
-{
-  const struct known_translation_t *s1;
-  const struct known_translation_t *s2;
-  int result;
-
-  s1 = (const struct known_translation_t *) p1;
-  s2 = (const struct known_translation_t *) p2;
-
-  result = strcmp (s1->msgid, s2->msgid);
-  if (result == 0)
-    {
-      result = strcmp (s1->domainname, s2->domainname);
-      if (result == 0)
-	{
-#ifdef HAVE_PER_THREAD_LOCALE
-	  result = strcmp (s1->localename, s2->localename);
-	  if (result == 0)
-#endif
-	    {
-#ifdef IN_LIBGLOCALE
-	      result = strcmp (s1->encoding, s2->encoding);
-	      if (result == 0)
-#endif
-		/* We compare the category last (though this is the cheapest
-		   operation) since it is hopefully always the same (namely
-		   LC_MESSAGES).  */
-		result = s1->category - s2->category;
-	    }
-	}
-    }
-
-  return result;
-}
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] attribute_hidden = "messages";
-
-#ifndef IN_LIBGLOCALE
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain attribute_hidden
-     = _nl_default_default_domain;
-#endif
-
-/* Contains the default location of the message catalogs.  */
-#if defined __EMX__
-extern const char _nl_default_dirname[];
-#else
-# ifdef _LIBC
-extern const char _nl_default_dirname[];
-libc_hidden_proto (_nl_default_dirname)
-# endif
-const char _nl_default_dirname[] = LOCALEDIR;
-# ifdef _LIBC
-libc_hidden_data_def (_nl_default_dirname)
-# endif
-#endif
-
-#ifndef IN_LIBGLOCALE
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-#endif
-
-/* Prototypes for local functions.  */
-static char *plural_lookup (struct loaded_l10nfile *domain,
-			    unsigned long int n,
-			    const char *translation, size_t translation_len)
-     internal_function;
-
-#ifdef IN_LIBGLOCALE
-static const char *guess_category_value (int category,
-					 const char *categoryname,
-					 const char *localename)
-     internal_function;
-#else
-static const char *guess_category_value (int category,
-					 const char *categoryname)
-     internal_function;
-#endif
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-# define category_to_name(category) \
-  _nl_category_names.str + _nl_category_name_idxs[category]
-#else
-static const char *category_to_name (int category) internal_function;
-#endif
-#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
-static const char *get_output_charset (struct binding *domainbinding)
-     internal_function;
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define freea(p) /* nothing */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old->address);						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-# define freea(p) free (p)
-#endif	/* have alloca */
-
-
-#ifdef _LIBC
-/* List of blocks allocated for translations.  */
-typedef struct transmem_list
-{
-  struct transmem_list *next;
-  char data[ZERO];
-} transmem_block_t;
-static struct transmem_list *transmem_list;
-#else
-typedef unsigned char transmem_block_t;
-#endif
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCIGETTEXT __dcigettext
-#else
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
-   easier methods therefore we make a difference here.  */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-# ifndef HAVE_GETUID
-#  define getuid() 0
-# endif
-# ifndef HAVE_GETGID
-#  define getgid() 0
-# endif
-# ifndef HAVE_GETEUID
-#  define geteuid() getuid()
-# endif
-# ifndef HAVE_GETEGID
-#  define getegid() getgid()
-# endif
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
-  if (enable_secure == 0)						      \
-    {									      \
-      if (getuid () != geteuid () || getgid () != getegid ())		      \
-	enable_secure = 1;						      \
-      else								      \
-	enable_secure = -1;						      \
-    }
-#endif
-
-/* Get the function to evaluate the plural expression.  */
-#include "eval-plural.h"
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   CATEGORY locale and, if PLURAL is nonzero, search over string
-   depending on the plural form determined by N.  */
-#ifdef IN_LIBGLOCALE
-char *
-gl_dcigettext (const char *domainname,
-	       const char *msgid1, const char *msgid2,
-	       int plural, unsigned long int n,
-	       int category,
-	       const char *localename, const char *encoding)
-#else
-char *
-DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
-	    int plural, unsigned long int n, int category)
-#endif
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  const char *dirname;
-  char *xdomainname;
-  char *single_locale;
-  char *retval;
-  size_t retlen;
-  int saved_errno;
-#if defined HAVE_TSEARCH || defined _LIBC
-  struct known_translation_t *search;
-  struct known_translation_t **foundp = NULL;
-  size_t msgid_len;
-# if defined HAVE_PER_THREAD_LOCALE && !defined IN_LIBGLOCALE
-  const char *localename;
-# endif
-#endif
-  size_t domainname_len;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid1 == NULL)
-    return NULL;
-
-#ifdef _LIBC
-  if (category < 0 || category >= __LC_LAST || category == LC_ALL)
-    /* Bogus.  */
-    return (plural == 0
-	    ? (char *) msgid1
-	    /* Use the Germanic plural rule.  */
-	    : n == 1 ? (char *) msgid1 : (char *) msgid2);
-#endif
-
-  gl_rwlock_rdlock (_nl_state_lock);
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     definition left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* OS/2 specific: backward compatibility with older libintl versions  */
-#ifdef LC_MESSAGES_COMPAT
-  if (category == LC_MESSAGES_COMPAT)
-    category = LC_MESSAGES;
-#endif
-
-#if defined HAVE_TSEARCH || defined _LIBC
-  msgid_len = strlen (msgid1) + 1;
-
-  /* Try to find the translation among those which we found at
-     some time.  */
-  search = (struct known_translation_t *)
-	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
-  memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = domainname;
-  search->category = category;
-# ifdef HAVE_PER_THREAD_LOCALE
-#  ifndef IN_LIBGLOCALE
-#   ifdef _LIBC
-  localename = __current_locale_name (category);
-#   else
-#    if HAVE_NL_LOCALE_NAME
-  /* NL_LOCALE_NAME is public glibc API introduced in glibc-2.4.  */
-  localename = nl_langinfo (NL_LOCALE_NAME (category));
-#    else
-#     if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS
-  /* The __names field is not public glibc API and must therefore not be used
-     in code that is installed in public locations.  */
-  {
-    locale_t thread_locale = uselocale (NULL);
-    if (thread_locale != LC_GLOBAL_LOCALE)
-      localename = thread_locale->__names[category];
-    else
-      localename = "";
-  }
-#     endif
-#    endif
-#   endif
-#  endif
-  search->localename = localename;
-#  ifdef IN_LIBGLOCALE
-  search->encoding = encoding;
-#  endif
-# endif
-
-  /* Since tfind/tsearch manage a balanced tree, concurrent tfind and
-     tsearch calls can be fatal.  */
-  gl_rwlock_rdlock (tree_lock);
-
-  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
-
-  gl_rwlock_unlock (tree_lock);
-
-  freea (search);
-  if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-    {
-      /* Now deal with plural.  */
-      if (plural)
-	retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
-				(*foundp)->translation_length);
-      else
-	retval = (char *) (*foundp)->translation;
-
-      gl_rwlock_unlock (_nl_state_lock);
-      return retval;
-    }
-#endif
-
-  /* Preserve the `errno' value.  */
-  saved_errno = errno;
-
-  /* See whether this is a SUID binary or not.  */
-  DETERMINE_SECURE;
-
-  /* First find matching binding.  */
-#ifdef IN_LIBGLOCALE
-  /* We can use a trivial binding, since _nl_find_msg will ignore it anyway,
-     and _nl_load_domain and _nl_find_domain just pass it through.  */
-  binding = NULL;
-  dirname = bindtextdomain (domainname, NULL);
-#else
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = _nl_default_dirname;
-  else
-    {
-      dirname = binding->dirname;
-#endif
-      if (!IS_ABSOLUTE_PATH (dirname))
-	{
-	  /* We have a relative path.  Make it absolute now.  */
-	  size_t dirname_len = strlen (dirname) + 1;
-	  size_t path_max;
-	  char *resolved_dirname;
-	  char *ret;
-
-	  path_max = (unsigned int) PATH_MAX;
-	  path_max += 2;		/* The getcwd docs say to do this.  */
-
-	  for (;;)
-	    {
-	      resolved_dirname = (char *) alloca (path_max + dirname_len);
-	      ADD_BLOCK (block_list, tmp_dirname);
-
-	      __set_errno (0);
-	      ret = getcwd (resolved_dirname, path_max);
-	      if (ret != NULL || errno != ERANGE)
-		break;
-
-	      path_max += path_max / 2;
-	      path_max += PATH_INCR;
-	    }
-
-	  if (ret == NULL)
-	    /* We cannot get the current working directory.  Don't signal an
-	       error but simply return the default string.  */
-	    goto return_untranslated;
-
-	  stpcpy (stpcpy (strchr (resolved_dirname, '\0'), "/"), dirname);
-	  dirname = resolved_dirname;
-	}
-#ifndef IN_LIBGLOCALE
-    }
-#endif
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-#ifdef IN_LIBGLOCALE
-  categoryvalue = guess_category_value (category, categoryname, localename);
-#else
-  categoryvalue = guess_category_value (category, categoryname);
-#endif
-
-  domainname_len = strlen (domainname);
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + domainname_len + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname, domainname_len),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for the translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-
-	  /* When this is a SUID binary we must not allow accessing files
-	     outside the dedicated directories.  */
-	  if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
-	    /* Ingore this entry.  */
-	    continue;
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	break;
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
-
-      if (domain != NULL)
-	{
-#if defined IN_LIBGLOCALE
-	  retval = _nl_find_msg (domain, binding, encoding, msgid1, &retlen);
-#else
-	  retval = _nl_find_msg (domain, binding, msgid1, 1, &retlen);
-#endif
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-#if defined IN_LIBGLOCALE
-		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 encoding, msgid1, &retlen);
-#else
-		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 msgid1, 1, &retlen);
-#endif
-
-		  if (retval != NULL)
-		    {
-		      domain = domain->successor[cnt];
-		      break;
-		    }
-		}
-	    }
-
-	  /* Returning -1 means that some resource problem exists
-	     (likely memory) and that the strings could not be
-	     converted.  Return the original strings.  */
-	  if (__builtin_expect (retval == (char *) -1, 0))
-	    break;
-
-	  if (retval != NULL)
-	    {
-	      /* Found the translation of MSGID1 in domain DOMAIN:
-		 starting at RETVAL, RETLEN bytes.  */
-	      FREE_BLOCKS (block_list);
-#if defined HAVE_TSEARCH || defined _LIBC
-	      if (foundp == NULL)
-		{
-		  /* Create a new entry and add it to the search tree.  */
-		  size_t size;
-		  struct known_translation_t *newp;
-
-		  size = offsetof (struct known_translation_t, msgid)
-			 + msgid_len + domainname_len + 1;
-# ifdef HAVE_PER_THREAD_LOCALE
-		  size += strlen (localename) + 1;
-# endif
-		  newp = (struct known_translation_t *) malloc (size);
-		  if (newp != NULL)
-		    {
-		      char *new_domainname;
-# ifdef HAVE_PER_THREAD_LOCALE
-		      char *new_localename;
-# endif
-
-		      new_domainname = mempcpy (newp->msgid, msgid1, msgid_len);
-		      memcpy (new_domainname, domainname, domainname_len + 1);
-# ifdef HAVE_PER_THREAD_LOCALE
-		      new_localename = new_domainname + domainname_len + 1;
-		      strcpy (new_localename, localename);
-# endif
-		      newp->domainname = new_domainname;
-		      newp->category = category;
-# ifdef HAVE_PER_THREAD_LOCALE
-		      newp->localename = new_localename;
-# endif
-# ifdef IN_LIBGLOCALE
-		      newp->encoding = encoding;
-# endif
-		      newp->counter = _nl_msg_cat_cntr;
-		      newp->domain = domain;
-		      newp->translation = retval;
-		      newp->translation_length = retlen;
-
-		      gl_rwlock_wrlock (tree_lock);
-
-		      /* Insert the entry in the search tree.  */
-		      foundp = (struct known_translation_t **)
-			tsearch (newp, &root, transcmp);
-
-		      gl_rwlock_unlock (tree_lock);
-
-		      if (foundp == NULL
-			  || __builtin_expect (*foundp != newp, 0))
-			/* The insert failed.  */
-			free (newp);
-		    }
-		}
-	      else
-		{
-		  /* We can update the existing entry.  */
-		  (*foundp)->counter = _nl_msg_cat_cntr;
-		  (*foundp)->domain = domain;
-		  (*foundp)->translation = retval;
-		  (*foundp)->translation_length = retlen;
-		}
-#endif
-	      __set_errno (saved_errno);
-
-	      /* Now deal with plural.  */
-	      if (plural)
-		retval = plural_lookup (domain, n, retval, retlen);
-
-	      gl_rwlock_unlock (_nl_state_lock);
-	      return retval;
-	    }
-	}
-    }
-
- return_untranslated:
-  /* Return the untranslated MSGID.  */
-  FREE_BLOCKS (block_list);
-  gl_rwlock_unlock (_nl_state_lock);
-#ifndef _LIBC
-  if (!ENABLE_SECURE)
-    {
-      extern void _nl_log_untranslated (const char *logfilename,
-					const char *domainname,
-					const char *msgid1, const char *msgid2,
-					int plural);
-      const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
-
-      if (logfilename != NULL && logfilename[0] != '\0')
-	_nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
-    }
-#endif
-  __set_errno (saved_errno);
-  return (plural == 0
-	  ? (char *) msgid1
-	  /* Use the Germanic plural rule.  */
-	  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-}
-
-
-/* Look up the translation of msgid within DOMAIN_FILE and DOMAINBINDING.
-   Return it if found.  Return NULL if not found or in case of a conversion
-   failure (problem in the particular message catalog).  Return (char *) -1
-   in case of a memory allocation failure during conversion (only if
-   ENCODING != NULL resp. CONVERT == true).  */
-char *
-internal_function
-#ifdef IN_LIBGLOCALE
-_nl_find_msg (struct loaded_l10nfile *domain_file,
-	      struct binding *domainbinding, const char *encoding,
-	      const char *msgid,
-	      size_t *lengthp)
-#else
-_nl_find_msg (struct loaded_l10nfile *domain_file,
-	      struct binding *domainbinding,
-	      const char *msgid, int convert,
-	      size_t *lengthp)
-#endif
-{
-  struct loaded_domain *domain;
-  nls_uint32 nstrings;
-  size_t act;
-  char *result;
-  size_t resultlen;
-
-  if (domain_file->decided <= 0)
-    _nl_load_domain (domain_file, domainbinding);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  nstrings = domain->nstrings;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = __hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
-      while (1)
-	{
-	  nls_uint32 nstr =
-	    W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
-
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  nstr--;
-
-	  /* Compare msgid with the original string at index nstr.
-	     We compare the lengths with >=, not ==, because plural entries
-	     are represented by strings with an embedded NUL.  */
-	  if (nstr < nstrings
-	      ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
-		&& (strcmp (msgid,
-			    domain->data + W (domain->must_swap,
-					      domain->orig_tab[nstr].offset))
-		    == 0)
-	      : domain->orig_sysdep_tab[nstr - nstrings].length > len
-		&& (strcmp (msgid,
-			    domain->orig_sysdep_tab[nstr - nstrings].pointer)
-		    == 0))
-	    {
-	      act = nstr;
-	      goto found;
-	    }
-
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-	}
-      /* NOTREACHED */
-    }
-  else
-    {
-      /* Try the default method:  binary search in the sorted array of
-	 messages.  */
-      size_t top, bottom;
-
-      bottom = 0;
-      top = nstrings;
-      while (bottom < top)
-	{
-	  int cmp_val;
-
-	  act = (bottom + top) / 2;
-	  cmp_val = strcmp (msgid, (domain->data
-				    + W (domain->must_swap,
-					 domain->orig_tab[act].offset)));
-	  if (cmp_val < 0)
-	    top = act;
-	  else if (cmp_val > 0)
-	    bottom = act + 1;
-	  else
-	    goto found;
-	}
-      /* No translation was found.  */
-      return NULL;
-    }
-
- found:
-  /* The translation was found at index ACT.  If we have to convert the
-     string to use a different character set, this is the time.  */
-  if (act < nstrings)
-    {
-      result = (char *)
-	(domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
-      resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
-    }
-  else
-    {
-      result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
-      resultlen = domain->trans_sysdep_tab[act - nstrings].length;
-    }
-
-#if defined _LIBC || HAVE_ICONV
-# ifdef IN_LIBGLOCALE
-  if (encoding != NULL)
-# else
-  if (convert)
-# endif
-    {
-      /* We are supposed to do a conversion.  */
-# ifndef IN_LIBGLOCALE
-      const char *encoding = get_output_charset (domainbinding);
-# endif
-
-      /* Search whether a table with converted translations for this
-	 encoding has already been allocated.  */
-      size_t nconversions = domain->nconversions;
-      struct converted_domain *convd = NULL;
-      size_t i;
-
-      for (i = nconversions; i > 0; )
-	{
-	  i--;
-	  if (strcmp (domain->conversions[i].encoding, encoding) == 0)
-	    {
-	      convd = &domain->conversions[i];
-	      break;
-	    }
-	}
-
-      if (convd == NULL)
-	{
-	  /* Allocate a table for the converted translations for this
-	     encoding.  */
-	  struct converted_domain *new_conversions =
-	    (struct converted_domain *)
-	    (domain->conversions != NULL
-	     ? realloc (domain->conversions,
-			(nconversions + 1) * sizeof (struct converted_domain))
-	     : malloc ((nconversions + 1) * sizeof (struct converted_domain)));
-
-	  if (__builtin_expect (new_conversions == NULL, 0))
-	    /* Nothing we can do, no more memory.  We cannot use the
-	       translation because it might be encoded incorrectly.  */
-	    return (char *) -1;
-
-	  domain->conversions = new_conversions;
-
-	  /* Copy the 'encoding' string to permanent storage.  */
-	  encoding = strdup (encoding);
-	  if (__builtin_expect (encoding == NULL, 0))
-	    /* Nothing we can do, no more memory.  We cannot use the
-	       translation because it might be encoded incorrectly.  */
-	    return (char *) -1;
-
-	  convd = &new_conversions[nconversions];
-	  convd->encoding = encoding;
-
-	  /* Find out about the character set the file is encoded with.
-	     This can be found (in textual form) in the entry "".  If this
-	     entry does not exist or if this does not contain the 'charset='
-	     information, we will assume the charset matches the one the
-	     current locale and we don't have to perform any conversion.  */
-# ifdef _LIBC
-	  convd->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  convd->conv = (iconv_t) -1;
-#  endif
-# endif
-	  {
-	    char *nullentry;
-	    size_t nullentrylen;
-
-	    /* Get the header entry.  This is a recursion, but it doesn't
-	       reallocate domain->conversions because we pass
-	       encoding = NULL or convert = 0, respectively.  */
-	    nullentry =
-# ifdef IN_LIBGLOCALE
-	      _nl_find_msg (domain_file, domainbinding, NULL, "",
-			    &nullentrylen);
-# else
-	      _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
-# endif
-
-	    if (nullentry != NULL)
-	      {
-		const char *charsetstr;
-
-		charsetstr = strstr (nullentry, "charset=");
-		if (charsetstr != NULL)
-		  {
-		    size_t len;
-		    char *charset;
-		    const char *outcharset;
-
-		    charsetstr += strlen ("charset=");
-		    len = strcspn (charsetstr, " \t\n");
-
-		    charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-		    *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-		    memcpy (charset, charsetstr, len);
-		    charset[len] = '\0';
-# endif
-
-		    outcharset = encoding;
-
-# ifdef _LIBC
-		    /* We always want to use transliteration.  */
-		    outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-		    charset = norm_add_slashes (charset, "");
-		    int r = __gconv_open (outcharset, charset, &convd->conv,
-					  GCONV_AVOID_NOCONV);
-		    if (__builtin_expect (r != __GCONV_OK, 0))
-		      {
-			/* If the output encoding is the same there is
-			   nothing to do.  Otherwise do not use the
-			   translation at all.  */
-			if (__builtin_expect (r != __GCONV_NOCONV, 1))
-			  return NULL;
-
-			convd->conv = (__gconv_t) -1;
-		      }
-# else
-#  if HAVE_ICONV
-		    /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
-		       we want to use transliteration.  */
-#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
-       || _LIBICONV_VERSION >= 0x0105
-		    if (strchr (outcharset, '/') == NULL)
-		      {
-			char *tmp;
-
-			len = strlen (outcharset);
-			tmp = (char *) alloca (len + 10 + 1);
-			memcpy (tmp, outcharset, len);
-			memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-			outcharset = tmp;
-
-			convd->conv = iconv_open (outcharset, charset);
-
-			freea (outcharset);
-		      }
-		    else
-#   endif
-		      convd->conv = iconv_open (outcharset, charset);
-#  endif
-# endif
-
-		    freea (charset);
-		  }
-	      }
-	  }
-	  convd->conv_tab = NULL;
-	  /* Here domain->conversions is still == new_conversions.  */
-	  domain->nconversions++;
-	}
-
-      if (
-# ifdef _LIBC
-	  convd->conv != (__gconv_t) -1
-# else
-#  if HAVE_ICONV
-	  convd->conv != (iconv_t) -1
-#  endif
-# endif
-	  )
-	{
-	  /* We are supposed to do a conversion.  First allocate an
-	     appropriate table with the same structure as the table
-	     of translations in the file, where we can put the pointers
-	     to the converted strings in.
-	     There is a slight complication with plural entries.  They
-	     are represented by consecutive NUL terminated strings.  We
-	     handle this case by converting RESULTLEN bytes, including
-	     NULs.  */
-
-	  if (convd->conv_tab == NULL
-	      && ((convd->conv_tab =
-		    (char **) calloc (nstrings + domain->n_sysdep_strings,
-				      sizeof (char *)))
-		  == NULL))
-	    /* Mark that we didn't succeed allocating a table.  */
-	    convd->conv_tab = (char **) -1;
-
-	  if (__builtin_expect (convd->conv_tab == (char **) -1, 0))
-	    /* Nothing we can do, no more memory.  We cannot use the
-	       translation because it might be encoded incorrectly.  */
-	    return (char *) -1;
-
-	  if (convd->conv_tab[act] == NULL)
-	    {
-	      /* We haven't used this string so far, so it is not
-		 translated yet.  Do this now.  */
-	      /* We use a bit more efficient memory handling.
-		 We allocate always larger blocks which get used over
-		 time.  This is faster than many small allocations.   */
-	      __libc_lock_define_initialized (static, lock)
-# define INITIAL_BLOCK_SIZE	4080
-	      static unsigned char *freemem;
-	      static size_t freemem_size;
-
-	      const unsigned char *inbuf;
-	      unsigned char *outbuf;
-	      int malloc_count;
-# ifndef _LIBC
-	      transmem_block_t *transmem_list = NULL;
-# endif
-
-	      __libc_lock_lock (lock);
-
-	      inbuf = (const unsigned char *) result;
-	      outbuf = freemem + sizeof (size_t);
-
-	      malloc_count = 0;
-	      while (1)
-		{
-		  transmem_block_t *newmem;
-# ifdef _LIBC
-		  size_t non_reversible;
-		  int res;
-
-		  if (freemem_size < sizeof (size_t))
-		    goto resize_freemem;
-
-		  res = __gconv (convd->conv,
-				 &inbuf, inbuf + resultlen,
-				 &outbuf,
-				 outbuf + freemem_size - sizeof (size_t),
-				 &non_reversible);
-
-		  if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
-		    break;
-
-		  if (res != __GCONV_FULL_OUTPUT)
-		    {
-		      /* We should not use the translation at all, it
-			 is incorrectly encoded.  */
-		      __libc_lock_unlock (lock);
-		      return NULL;
-		    }
-
-		  inbuf = (const unsigned char *) result;
-# else
-#  if HAVE_ICONV
-		  const char *inptr = (const char *) inbuf;
-		  size_t inleft = resultlen;
-		  char *outptr = (char *) outbuf;
-		  size_t outleft;
-
-		  if (freemem_size < sizeof (size_t))
-		    goto resize_freemem;
-
-		  outleft = freemem_size - sizeof (size_t);
-		  if (iconv (convd->conv,
-			     (ICONV_CONST char **) &inptr, &inleft,
-			     &outptr, &outleft)
-		      != (size_t) (-1))
-		    {
-		      outbuf = (unsigned char *) outptr;
-		      break;
-		    }
-		  if (errno != E2BIG)
-		    {
-		      __libc_lock_unlock (lock);
-		      return NULL;
-		    }
-#  endif
-# endif
-
-		resize_freemem:
-		  /* We must allocate a new buffer or resize the old one.  */
-		  if (malloc_count > 0)
-		    {
-		      ++malloc_count;
-		      freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
-		      newmem = (transmem_block_t *) realloc (transmem_list,
-							     freemem_size);
-# ifdef _LIBC
-		      if (newmem != NULL)
-			transmem_list = transmem_list->next;
-		      else
-			{
-			  struct transmem_list *old = transmem_list;
-
-			  transmem_list = transmem_list->next;
-			  free (old);
-			}
-# endif
-		    }
-		  else
-		    {
-		      malloc_count = 1;
-		      freemem_size = INITIAL_BLOCK_SIZE;
-		      newmem = (transmem_block_t *) malloc (freemem_size);
-		    }
-		  if (__builtin_expect (newmem == NULL, 0))
-		    {
-		      freemem = NULL;
-		      freemem_size = 0;
-		      __libc_lock_unlock (lock);
-		      return (char *) -1;
-		    }
-
-# ifdef _LIBC
-		  /* Add the block to the list of blocks we have to free
-		     at some point.  */
-		  newmem->next = transmem_list;
-		  transmem_list = newmem;
-
-		  freemem = (unsigned char *) newmem->data;
-		  freemem_size -= offsetof (struct transmem_list, data);
-# else
-		  transmem_list = newmem;
-		  freemem = newmem;
-# endif
-
-		  outbuf = freemem + sizeof (size_t);
-		}
-
-	      /* We have now in our buffer a converted string.  Put this
-		 into the table of conversions.  */
-	      *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
-	      convd->conv_tab[act] = (char *) freemem;
-	      /* Shrink freemem, but keep it aligned.  */
-	      freemem_size -= outbuf - freemem;
-	      freemem = outbuf;
-	      freemem += freemem_size & (alignof (size_t) - 1);
-	      freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
-	      __libc_lock_unlock (lock);
-	    }
-
-	  /* Now convd->conv_tab[act] contains the translation of all
-	     the plural variants.  */
-	  result = convd->conv_tab[act] + sizeof (size_t);
-	  resultlen = *(size_t *) convd->conv_tab[act];
-	}
-    }
-
-  /* The result string is converted.  */
-
-#endif /* _LIBC || HAVE_ICONV */
-
-  *lengthp = resultlen;
-  return result;
-}
-
-
-/* Look up a plural variant.  */
-static char *
-internal_function
-plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
-	       const char *translation, size_t translation_len)
-{
-  struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
-  unsigned long int index;
-  const char *p;
-
-  index = plural_eval (domaindata->plural, n);
-  if (index >= domaindata->nplurals)
-    /* This should never happen.  It means the plural expression and the
-       given maximum value do not match.  */
-    index = 0;
-
-  /* Skip INDEX strings at TRANSLATION.  */
-  p = translation;
-  while (index-- > 0)
-    {
-#ifdef _LIBC
-      p = __rawmemchr (p, '\0');
-#else
-      p = strchr (p, '\0');
-#endif
-      /* And skip over the NUL byte.  */
-      p++;
-
-      if (p >= translation + translation_len)
-	/* This should never happen.  It means the plural expression
-	   evaluated to a value larger than the number of variants
-	   available for MSGID1.  */
-	return (char *) translation;
-    }
-  return (char *) p;
-}
-
-#ifndef _LIBC
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (int category)
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-#endif
-
-/* Guess value of current locale from value of the environment variables
-   or system-dependent defaults.  */
-static const char *
-internal_function
-#ifdef IN_LIBGLOCALE
-guess_category_value (int category, const char *categoryname,
-		      const char *locale)
-
-#else
-guess_category_value (int category, const char *categoryname)
-#endif
-{
-  const char *language;
-#ifndef IN_LIBGLOCALE
-  const char *locale;
-# ifndef _LIBC
-  const char *language_default;
-  int locale_defaulted;
-# endif
-#endif
-
-  /* We use the settings in the following order:
-     1. The value of the environment variable 'LANGUAGE'.  This is a GNU
-        extension.  Its value can be a colon-separated list of locale names.
-     2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
-        More precisely, the first among these that is set to a non-empty value.
-        This is how POSIX specifies it.  The value is a single locale name.
-     3. A system-dependent preference list of languages.  Its value can be a
-        colon-separated list of locale names.
-     4. A system-dependent default locale name.
-     This way:
-       - System-dependent settings can be overridden by environment variables.
-       - If the system provides both a list of languages and a default locale,
-         the former is used.  */
-
-#ifndef IN_LIBGLOCALE
-  /* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
-     `LC_xxx', and `LANG'.  On some systems this can be done by the
-     `setlocale' function itself.  */
-# ifdef _LIBC
-  locale = __current_locale_name (category);
-# else
-#  if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS
-  /* The __names field is not public glibc API and must therefore not be used
-     in code that is installed in public locations.  */
-  locale_t thread_locale = uselocale (NULL);
-  if (thread_locale != LC_GLOBAL_LOCALE)
-    {
-      locale = thread_locale->__names[category];
-      locale_defaulted = 0;
-    }
-  else
-#  endif
-    {
-      locale = _nl_locale_name_posix (category, categoryname);
-      locale_defaulted = 0;
-      if (locale == NULL)
-	{
-	  locale = _nl_locale_name_default ();
-	  locale_defaulted = 1;
-	}
-    }
-# endif
-#endif
-
-  /* Ignore LANGUAGE and its system-dependent analogon if the locale is set
-     to "C" because
-     1. "C" locale usually uses the ASCII encoding, and most international
-	messages use non-ASCII characters. These characters get displayed
-	as question marks (if using glibc's iconv()) or as invalid 8-bit
-	characters (because other iconv()s refuse to convert most non-ASCII
-	characters to ASCII). In any case, the output is ugly.
-     2. The precise output of some programs in the "C" locale is specified
-	by POSIX and should not depend on environment variables like
-	"LANGUAGE" or system-dependent information.  We allow such programs
-        to use gettext().  */
-  if (strcmp (locale, "C") == 0)
-    return locale;
-
-  /* The highest priority value is the value of the 'LANGUAGE' environment
-     variable.  */
-  language = getenv ("LANGUAGE");
-  if (language != NULL && language[0] != '\0')
-    return language;
-#if !defined IN_LIBGLOCALE && !defined _LIBC
-  /* The next priority value is the locale name, if not defaulted.  */
-  if (locale_defaulted)
-    {
-      /* The next priority value is the default language preferences list. */
-      language_default = _nl_language_preferences_default ();
-      if (language_default != NULL)
-        return language_default;
-    }
-  /* The least priority value is the locale name, if defaulted.  */
-#endif
-  return locale;
-}
-
-#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
-/* Returns the output charset.  */
-static const char *
-internal_function
-get_output_charset (struct binding *domainbinding)
-{
-  /* The output charset should normally be determined by the locale.  But
-     sometimes the locale is not used or not correctly set up, so we provide
-     a possibility for the user to override this: the OUTPUT_CHARSET
-     environment variable.  Moreover, the value specified through
-     bind_textdomain_codeset overrides both.  */
-  if (domainbinding != NULL && domainbinding->codeset != NULL)
-    return domainbinding->codeset;
-  else
-    {
-      /* For speed reasons, we look at the value of OUTPUT_CHARSET only
-	 once.  This is a user variable that is not supposed to change
-	 during a program run.  */
-      static char *output_charset_cache;
-      static int output_charset_cached;
-
-      if (!output_charset_cached)
-	{
-	  const char *value = getenv ("OUTPUT_CHARSET");
-
-	  if (value != NULL && value[0] != '\0')
-	    {
-	      size_t len = strlen (value) + 1;
-	      char *value_copy = (char *) malloc (len);
-
-	      if (value_copy != NULL)
-		memcpy (value_copy, value, len);
-	      output_charset_cache = value_copy;
-	    }
-	  output_charset_cached = 1;
-	}
-
-      if (output_charset_cache != NULL)
-	return output_charset_cache;
-      else
-	{
-# ifdef _LIBC
-	  return _NL_CURRENT (LC_CTYPE, CODESET);
-# else
-#  if HAVE_ICONV
-	  extern const char *locale_charset (void);
-	  return locale_charset ();
-#  endif
-# endif
-	}
-    }
-}
-#endif
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (char *dest, const char *src)
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-#if !_LIBC && !HAVE_MEMPCPY
-static void *
-mempcpy (void *dest, const void *src, size_t n)
-{
-  return (void *) ((char *) memcpy (dest, src, n) + n);
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-libc_freeres_fn (free_mem)
-{
-  void *old;
-
-  while (_nl_domain_bindings != NULL)
-    {
-      struct binding *oldp = _nl_domain_bindings;
-      _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (oldp->dirname);
-      free (oldp->codeset);
-      free (oldp);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-
-  /* Remove the search tree with the known translations.  */
-  __tdestroy (root, free);
-  root = NULL;
-
-  while (transmem_list != NULL)
-    {
-      old = transmem_list;
-      transmem_list = transmem_list->next;
-      free (old);
-    }
-}
-#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
deleted file mode 100644
index eb368336c..000000000
--- a/intl/dcngettext.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT libintl_dcngettext
-# define DCIGETTEXT libintl_dcigettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (const char *domainname,
-	    const char *msgid1, const char *msgid2, unsigned long int n,
-	    int category)
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcngettext, dcngettext);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
deleted file mode 100644
index 9b0d0de6c..000000000
--- a/intl/dgettext.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-#include <locale.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define DGETTEXT libintl_dgettext
-# define DCGETTEXT libintl_dcgettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (const char *domainname, const char *msgid)
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/intl/dngettext.c b/intl/dngettext.c
deleted file mode 100644
index 3278438fe..000000000
--- a/intl/dngettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-#include <locale.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT libintl_dngettext
-# define DCNGETTEXT libintl_dcngettext
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (const char *domainname,
-	   const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
deleted file mode 100644
index dacd003db..000000000
--- a/intl/eval-plural.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Plural expression evaluation.
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-/* Evaluate the plural expression and return an index value.  */
-STATIC
-unsigned long int
-internal_function
-plural_eval (struct expression *pexp, unsigned long int n)
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
-      break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
-#if !INTDIV0_RAISES_SIGFPE
-		if (rightarg == 0)
-		  raise (SIGFPE);
-#endif
-		return leftarg / rightarg;
-	      case module:
-#if !INTDIV0_RAISES_SIGFPE
-		if (rightarg == 0)
-		  raise (SIGFPE);
-#endif
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
-      }
-    }
-  /* NOTREACHED */
-  return 0;
-}
diff --git a/intl/explodename.c b/intl/explodename.c
deleted file mode 100644
index 8d3e1463d..000000000
--- a/intl/explodename.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <[email protected]>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Split a locale name NAME into a leading language part and all the
-   rest.  Return a pointer to the first character after the language,
-   i.e. to the first byte of the rest.  */
-static char *_nl_find_language (const char *name);
-
-static char *
-_nl_find_language (const char *name)
-{
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
-    ++name;
-
-  return (char *) name;
-}
-
-
-int
-_nl_explode_name (char *name,
-		  const char **language, const char **modifier,
-		  const char **territory, const char **codeset,
-		  const char **normalized_codeset)
-{
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_', '.', and `@'.  */
-  mask = 0;
-  *language = cp = name;
-  cp = _nl_find_language (*language);
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else
-    {
-      if (cp[0] == '_')
-	{
-	  /* Next is the territory.  */
-	  cp[0] = '\0';
-	  *territory = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_TERRITORY;
-	}
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@')
-    {
-      /* Next is the modifier.  */
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      if (cp[0] != '\0')
-	mask |= XPG_MODIFIER;
-    }
-
-  if (*territory != NULL && (*territory)[0] == '\0')
-    mask &= ~XPG_TERRITORY;
-
-  if (*codeset != NULL && (*codeset)[0] == '\0')
-    mask &= ~XPG_CODESET;
-
-  return mask;
-}
diff --git a/intl/export.h b/intl/export.h
deleted file mode 100644
index b5c47ad5b..000000000
--- a/intl/export.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#if @HAVE_VISIBILITY@ && BUILDING_LIBINTL
-#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default")))
-#else
-#define LIBINTL_DLL_EXPORTED
-#endif
diff --git a/intl/finddomain.c b/intl/finddomain.c
deleted file mode 100644
index a25bebcb9..000000000
--- a/intl/finddomain.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000-2001, 2003-2006 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-# define gl_rwlock_define_initialized __libc_rwlock_define_initialized
-# define gl_rwlock_rdlock __libc_rwlock_rdlock
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
-#else
-# include "lock.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (const char *dirname, char *locale,
-		 const char *domainname, struct binding *domainbinding)
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory][.codeset][@modifier]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) codeset
-		(2) normalized codeset
-		(3) territory
-		(4) modifier
-   */
-
-  /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
-  gl_rwlock_define_initialized (static, lock);
-  gl_rwlock_rdlock (lock);
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, domainname, 0);
-
-  gl_rwlock_unlock (lock);
-
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided <= 0)
-	_nl_load_domain (retval, domainbinding);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided <= 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-
-      return retval;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_', '.', and `@'.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset);
-
-  /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
-  gl_rwlock_wrlock (lock);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier,
-			       domainname, 1);
-
-  gl_rwlock_unlock (lock);
-
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided <= 0)
-    _nl_load_domain (retval, domainbinding);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided <= 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-/* This is called from iconv/gconv_db.c's free_mem, as locales must
-   be freed before freeing gconv steps arrays.  */
-void __libc_freeres_fn_section
-_nl_finddomain_subfreeres ()
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free ((char *) here->filename);
-      free (here);
-    }
-}
-#endif
diff --git a/intl/gettext.c b/intl/gettext.c
deleted file mode 100644
index d82d439c0..000000000
--- a/intl/gettext.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define GETTEXT libintl_gettext
-# define DCGETTEXT libintl_dcgettext
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (const char *msgid)
-{
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/intl/gettextP.h b/intl/gettextP.h
deleted file mode 100644
index 8be38d2d7..000000000
--- a/intl/gettextP.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include <stddef.h>		/* Get size_t.  */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
-#ifdef _LIBC
-extern char *__gettext (const char *__msgid);
-extern char *__dgettext (const char *__domainname, const char *__msgid);
-extern char *__dcgettext (const char *__domainname, const char *__msgid,
-			  int __category);
-extern char *__ngettext (const char *__msgid1, const char *__msgid2,
-			 unsigned long int __n);
-extern char *__dngettext (const char *__domainname,
-			  const char *__msgid1, const char *__msgid2,
-			  unsigned long int n);
-extern char *__dcngettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   unsigned long int __n, int __category);
-extern char *__dcigettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   int __plural, unsigned long int __n,
-			   int __category);
-extern char *__textdomain (const char *__domainname);
-extern char *__bindtextdomain (const char *__domainname,
-			       const char *__dirname);
-extern char *__bind_textdomain_codeset (const char *__domainname,
-					const char *__codeset);
-extern void _nl_finddomain_subfreeres (void) attribute_hidden;
-extern void _nl_unload_domain (struct loaded_domain *__domain)
-     internal_function attribute_hidden;
-#else
-/* Declare the exported libintl_* functions, in a way that allows us to
-   call them under their real name.  */
-# undef _INTL_REDIRECT_INLINE
-# undef _INTL_REDIRECT_MACROS
-# define _INTL_REDIRECT_MACROS
-# include "libgnuintl.h"
-# ifdef IN_LIBGLOCALE
-extern char *gl_dcigettext (const char *__domainname,
-			    const char *__msgid1, const char *__msgid2,
-			    int __plural, unsigned long int __n,
-			    int __category,
-			    const char *__localename, const char *__encoding);
-# else
-extern char *libintl_dcigettext (const char *__domainname,
-				 const char *__msgid1, const char *__msgid2,
-				 int __plural, unsigned long int __n,
-				 int __category);
-# endif
-#endif
-
-#include "loadinfo.h"
-
-#include "gmo.h"		/* Get nls_uint32.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-/* In-memory representation of system dependent string.  */
-struct sysdep_string_desc
-{
-  /* Length of addressed string, including the trailing NUL.  */
-  size_t length;
-  /* Pointer to addressed string.  */
-  const char *pointer;
-};
-
-/* Cache of translated strings after charset conversion.
-   Note: The strings are converted to the target encoding only on an as-needed
-   basis.  */
-struct converted_domain
-{
-  /* The target encoding name.  */
-  const char *encoding;
-  /* The descriptor for conversion from the message catalog's encoding to
-     this target encoding.  */
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  /* The table of translated strings after charset conversion.  */
-  char **conv_tab;
-};
-
-/* The representation of an opened message catalog.  */
-struct loaded_domain
-{
-  /* Pointer to memory containing the .mo file.  */
-  const char *data;
-  /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed.  */
-  int use_mmap;
-  /* Size of mmap()ed memory.  */
-  size_t mmap_size;
-  /* 1 if the .mo file uses a different endianness than this machine.  */
-  int must_swap;
-  /* Pointer to additional malloc()ed memory.  */
-  void *malloced;
-
-  /* Number of static strings pairs.  */
-  nls_uint32 nstrings;
-  /* Pointer to descriptors of original strings in the file.  */
-  const struct string_desc *orig_tab;
-  /* Pointer to descriptors of translated strings in the file.  */
-  const struct string_desc *trans_tab;
-
-  /* Number of system dependent strings pairs.  */
-  nls_uint32 n_sysdep_strings;
-  /* Pointer to descriptors of original sysdep strings.  */
-  const struct sysdep_string_desc *orig_sysdep_tab;
-  /* Pointer to descriptors of translated sysdep strings.  */
-  const struct sysdep_string_desc *trans_sysdep_tab;
-
-  /* Size of hash table.  */
-  nls_uint32 hash_size;
-  /* Pointer to hash table.  */
-  const nls_uint32 *hash_tab;
-  /* 1 if the hash table uses a different endianness than this machine.  */
-  int must_swap_hash_tab;
-
-  /* Cache of charset conversions of the translated strings.  */
-  struct converted_domain *conversions;
-  size_t nconversions;
-
-  struct expression *plural;
-  unsigned long int nplurals;
-};
-
-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
-struct binding
-{
-  struct binding *next;
-  char *dirname;
-  char *codeset;
-  char domainname[ZERO];
-};
-
-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-#ifdef IN_LIBGLOCALE
-# include <glocale/config.h>
-extern LIBGLOCALE_DLL_EXPORTED int _nl_msg_cat_cntr;
-#else
-extern LIBINTL_DLL_EXPORTED int _nl_msg_cat_cntr;
-#endif
-
-#ifndef _LIBC
-const char *_nl_language_preferences_default (void);
-const char *_nl_locale_name_posix (int category, const char *categoryname);
-const char *_nl_locale_name_default (void);
-const char *_nl_locale_name (int category, const char *categoryname);
-#endif
-
-struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
-					 const char *__domainname,
-					 struct binding *__domainbinding)
-     internal_function;
-void _nl_load_domain (struct loaded_l10nfile *__domain,
-		      struct binding *__domainbinding)
-     internal_function;
-
-#ifdef IN_LIBGLOCALE
-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
-		    struct binding *domainbinding, const char *encoding,
-		    const char *msgid,
-		    size_t *lengthp)
-     internal_function;
-#else
-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
-		    struct binding *domainbinding, const char *msgid,
-		    int convert, size_t *lengthp)
-     internal_function;
-#endif
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/intl/gmo.h b/intl/gmo.h
deleted file mode 100644
index 26515feb2..000000000
--- a/intl/gmo.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <limits.h>
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-
-  /* The following are only used in .mo files with major revision 0 or 1.  */
-
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translated strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hash table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hash table entry.  */
-  nls_uint32 hash_tab_offset;
-
-  /* The following are only used in .mo files with minor revision >= 1.  */
-
-  /* The number of system dependent segments.  */
-  nls_uint32 n_sysdep_segments;
-  /* Offset of table describing system dependent segments.  */
-  nls_uint32 sysdep_segments_offset;
-  /* The number of system dependent strings pairs.  */
-  nls_uint32 n_sysdep_strings;
-  /* Offset of table with start offsets of original sysdep strings.  */
-  nls_uint32 orig_sysdep_tab_offset;
-  /* Offset of table with start offsets of translated sysdep strings.  */
-  nls_uint32 trans_sysdep_tab_offset;
-};
-
-/* Descriptor for static string contained in the binary .mo file.  */
-struct string_desc
-{
-  /* Length of addressed string, not including the trailing NUL.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* The following are only used in .mo files with minor revision >= 1.  */
-
-/* Descriptor for system dependent string segment.  */
-struct sysdep_segment
-{
-  /* Length of addressed string, including the trailing NUL.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* Descriptor for system dependent string.  */
-struct sysdep_string
-{
-  /* Offset of static string segments in file.  */
-  nls_uint32 offset;
-  /* Alternating sequence of static and system dependent segments.
-     The last segment is a static segment, including the trailing NUL.  */
-  struct segment_pair
-  {
-    /* Size of static segment.  */
-    nls_uint32 segsize;
-    /* Reference to system dependent string segment, or ~0 at the end.  */
-    nls_uint32 sysdepref;
-  } segments[1];
-};
-
-/* Marker for the end of the segments[] array.  This has the value 0xFFFFFFFF,
-   regardless whether 'int' is 16 bit, 32 bit, or 64 bit.  */
-#define SEGMENTS_END ((nls_uint32) ~0)
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/intl/hash-string.c b/intl/hash-string.c
deleted file mode 100644
index 3c513f099..000000000
--- a/intl/hash-string.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include "hash-string.h"
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-unsigned long int
-__hash_string (const char *str_param)
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned char) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/intl/hash-string.h b/intl/hash-string.h
deleted file mode 100644
index 98c07e4a7..000000000
--- a/intl/hash-string.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997-1998, 2000-2003, 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* @@ end of prolog @@ */
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-#ifndef _LIBC
-# ifdef IN_LIBINTL
-#  define __hash_string libintl_hash_string
-# else
-#  define __hash_string hash_string
-# endif
-#endif
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-extern unsigned long int __hash_string (const char *str_param);
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
deleted file mode 100644
index 9b9ecbb64..000000000
--- a/intl/intl-compat.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995, 2000-2003, 2005 Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* This file redirects the gettext functions (without prefix) to those
-   defined in the included GNU libintl library (with "libintl_" prefix).
-   It is compiled into libintl in order to make the AM_GNU_GETTEXT test
-   of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
-   has the redirections primarily in the <libintl.h> include file.
-   It is also compiled into libgnuintl so that libgnuintl.so can be used
-   as LD_PRELOADable library on glibc systems, to provide the extra
-   features that the functions in the libc don't have (namely, logging).  */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
-#undef textdomain
-#undef bindtextdomain
-#undef bind_textdomain_codeset
-
-
-/* When building a DLL, we must export some functions.  Note that because
-   the functions are only defined for binary backward compatibility, we
-   don't need to use __declspec(dllimport) in any case.  */
-#if HAVE_VISIBILITY && BUILDING_DLL
-# define DLL_EXPORTED __attribute__((__visibility__("default")))
-#elif defined _MSC_VER && BUILDING_DLL
-# define DLL_EXPORTED __declspec(dllexport)
-#else
-# define DLL_EXPORTED
-#endif
-
-
-DLL_EXPORTED
-char *
-gettext (const char *msgid)
-{
-  return libintl_gettext (msgid);
-}
-
-
-DLL_EXPORTED
-char *
-dgettext (const char *domainname, const char *msgid)
-{
-  return libintl_dgettext (domainname, msgid);
-}
-
-
-DLL_EXPORTED
-char *
-dcgettext (const char *domainname, const char *msgid, int category)
-{
-  return libintl_dcgettext (domainname, msgid, category);
-}
-
-
-DLL_EXPORTED
-char *
-ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return libintl_ngettext (msgid1, msgid2, n);
-}
-
-
-DLL_EXPORTED
-char *
-dngettext (const char *domainname,
-	   const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return libintl_dngettext (domainname, msgid1, msgid2, n);
-}
-
-
-DLL_EXPORTED
-char *
-dcngettext (const char *domainname,
-	    const char *msgid1, const char *msgid2, unsigned long int n,
-	    int category)
-{
-  return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
-}
-
-
-DLL_EXPORTED
-char *
-textdomain (const char *domainname)
-{
-  return libintl_textdomain (domainname);
-}
-
-
-DLL_EXPORTED
-char *
-bindtextdomain (const char *domainname, const char *dirname)
-{
-  return libintl_bindtextdomain (domainname, dirname);
-}
-
-
-DLL_EXPORTED
-char *
-bind_textdomain_codeset (const char *domainname, const char *codeset)
-{
-  return libintl_bind_textdomain_codeset (domainname, codeset);
-}
diff --git a/intl/intl-exports.c b/intl/intl-exports.c
deleted file mode 100644
index 717658994..000000000
--- a/intl/intl-exports.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* List of exported symbols of libintl on Cygwin.
-   Copyright (C) 2006 Free Software Foundation, Inc.
-   Written by Bruno Haible <[email protected]>, 2006.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
- /* IMP(x) is a symbol that contains the address of x.  */
-#define IMP(x) _imp__##x
-
- /* Ensure that the variable x is exported from the library, and that a
-    pseudo-variable IMP(x) is available.  */
-#define VARIABLE(x) \
- /* Export x without redefining x.  This code was found by compiling a	\
-    snippet:								\
-      extern __declspec(dllexport) int x; int x = 42;  */		\
- asm (".section .drectve\n");						\
- asm (".ascii \" -export:" #x ",data\"\n");				\
- asm (".data\n");							\
- /* Allocate a pseudo-variable IMP(x).  */				\
- extern int x;								\
- void * IMP(x) = &x;
-
-VARIABLE(libintl_version)
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
deleted file mode 100644
index 365aeb708..000000000
--- a/intl/l10nflist.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/* Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <[email protected]>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
-# endif
-#endif
-
-/* Pathname support.
-   ISSLASH(C)           tests whether C is a directory separator character.
-   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
-                        it may be concatenated to a directory pathname.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
-    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
-     && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-#else
-  /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-#endif
-
-/* Define function which are usually not available.  */
-
-#ifdef _LIBC
-# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-#elif defined HAVE_ARGZ_COUNT
-# undef __argz_count
-# define __argz_count argz_count
-#else
-/* Returns the number of strings in ARGZ.  */
-static size_t
-argz_count__ (const char *argz, size_t len)
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE_ARGZ_COUNT */
-
-#ifdef _LIBC
-# define __argz_stringify(argz, len, sep) \
-  INTUSE(__argz_stringify) (argz, len, sep)
-#elif defined HAVE_ARGZ_STRINGIFY
-# undef __argz_stringify
-# define __argz_stringify argz_stringify
-#else
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void
-argz_stringify__ (char *argz, size_t len, int sep)
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE_ARGZ_STRINGIFY */
-
-#ifdef _LIBC
-#elif defined HAVE_ARGZ_NEXT
-# undef __argz_next
-# define __argz_next argz_next
-#else
-static char *
-argz_next__ (char *argz, size_t argz_len, const char *entry)
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE_ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static inline int
-pop (int x)
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
-		    const char *dirlist, size_t dirlist_len,
-		    int mask, const char *language, const char *territory,
-		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier,
-		    const char *filename, int do_allocate)
-{
-  char *abs_filename;
-  struct loaded_l10nfile **lastp;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t dirlist_count;
-  size_t entries;
-  int cnt;
-
-  /* If LANGUAGE contains an absolute directory specification, we ignore
-     DIRLIST.  */
-  if (IS_ABSOLUTE_PATH (language))
-    dirlist_len = 0;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & XPG_TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + ((mask & XPG_MODIFIER) != 0
-				     ? strlen (modifier) + 1 : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  /* Construct file name.  */
-  cp = abs_filename;
-  if (dirlist_len > 0)
-    {
-      memcpy (cp, dirlist, dirlist_len);
-      __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
-      cp += dirlist_len;
-      cp[-1] = '/';
-    }
-
-  cp = stpcpy (cp, language);
-
-  if ((mask & XPG_TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & XPG_MODIFIER) != 0)
-    {
-      *cp++ = '@';
-      cp = stpcpy (cp, modifier);
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  lastp = l10nfile_list;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	lastp = &retval->next;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
-
-  /* Allocate a new loaded_l10nfile.  */
-  retval =
-    (struct loaded_l10nfile *)
-    malloc (sizeof (*retval)
-	    + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
-	       * sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    {
-      free (abs_filename);
-      return NULL;
-    }
-
-  retval->filename = abs_filename;
-
-  /* We set retval->data to NULL here; it is filled in later.
-     Setting retval->decided to 1 here means that retval does not
-     correspond to a real file (dirlist_count > 1) or is not worth
-     looking up (if an unnormalized codeset was specified).  */
-  retval->decided = (dirlist_count > 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  retval->next = *lastp;
-  *lastp = retval;
-
-  entries = 0;
-  /* Recurse to fill the inheritance list of RETVAL.
-     If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
-     entry does not correspond to a real file; retval->filename contains
-     colons.  In this case we loop across all elements of DIRLIST and
-     across all bit patterns dominated by MASK.
-     If the DIRLIST is a single directory or entirely redundant (i.e.
-     DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
-     MASK, excluding MASK itself.
-     In either case, we loop down from MASK to 0.  This has the effect
-     that the extra bits in the locale name are dropped in this order:
-     first the modifier, then the territory, then the codeset, then the
-     normalized_codeset.  */
-  for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& !((cnt & XPG_CODESET) != 0 && (cnt & XPG_NORM_CODESET) != 0))
-      {
-	if (dirlist_count > 1)
-	  {
-	    /* Iterate over all elements of the DIRLIST.  */
-	    char *dir = NULL;
-
-	    while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-		   != NULL)
-	      retval->successor[entries++]
-		= _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
-				      cnt, language, territory, codeset,
-				      normalized_codeset, modifier, filename,
-				      1);
-	  }
-	else
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
-				  cnt, language, territory, codeset,
-				  normalized_codeset, modifier, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-const char *
-_nl_normalize_codeset (const char *codeset, size_t name_len)
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum ((unsigned char) codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  *wp++ = tolower ((unsigned char) codeset[cnt]);
-	else if (isdigit ((unsigned char) codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (char *dest, const char *src)
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/langprefs.c b/intl/langprefs.c
deleted file mode 100644
index 59c8def21..000000000
--- a/intl/langprefs.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Determine the user's language preferences.
-   Copyright (C) 2004-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <[email protected]>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-
-#if HAVE_CFPREFERENCESCOPYAPPVALUE
-# include <string.h>
-# include <CoreFoundation/CFPreferences.h>
-# include <CoreFoundation/CFPropertyList.h>
-# include <CoreFoundation/CFArray.h>
-# include <CoreFoundation/CFString.h>
-extern void _nl_locale_name_canonicalize (char *name);
-#endif
-
-/* Determine the user's language preferences, as a colon separated list of
-   locale names in XPG syntax
-     language[_territory][.codeset][@modifier]
-   The result must not be freed; it is statically allocated.
-   The LANGUAGE environment variable does not need to be considered; it is
-   already taken into account by the caller.  */
-
-const char *
-_nl_language_preferences_default (void)
-{
-#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
-  {
-    /* Cache the preferences list, since CoreFoundation calls are expensive.  */
-    static const char *cached_languages;
-    static int cache_initialized;
-
-    if (!cache_initialized)
-      {
-	CFTypeRef preferences =
-	  CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
-				     kCFPreferencesCurrentApplication);
-	if (preferences != NULL
-	    && CFGetTypeID (preferences) == CFArrayGetTypeID ())
-	  {
-	    CFArrayRef prefArray = (CFArrayRef)preferences;
-	    int n = CFArrayGetCount (prefArray);
-	    char buf[256];
-	    size_t size = 0;
-	    int i;
-
-	    for (i = 0; i < n; i++)
-	      {
-		CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
-		if (element != NULL
-		    && CFGetTypeID (element) == CFStringGetTypeID ()
-		    && CFStringGetCString ((CFStringRef)element,
-					   buf, sizeof (buf),
-					   kCFStringEncodingASCII))
-		  {
-		    _nl_locale_name_canonicalize (buf);
-		    size += strlen (buf) + 1;
-		    /* Most GNU programs use msgids in English and don't ship
-		       an en.mo message catalog.  Therefore when we see "en"
-		       in the preferences list, arrange for gettext() to
-		       return the msgid, and ignore all further elements of
-		       the preferences list.  */
-		    if (strcmp (buf, "en") == 0)
-		      break;
-		  }
-		else
-		  break;
-	      }
-	    if (size > 0)
-	      {
-		char *languages = (char *) malloc (size);
-
-		if (languages != NULL)
-		  {
-		    char *p = languages;
-
-		    for (i = 0; i < n; i++)
-		      {
-			CFTypeRef element =
-			  CFArrayGetValueAtIndex (prefArray, i);
-			if (element != NULL
-		            && CFGetTypeID (element) == CFStringGetTypeID ()
-			    && CFStringGetCString ((CFStringRef)element,
-						   buf, sizeof (buf),
-						   kCFStringEncodingASCII))
-			  {
-			    _nl_locale_name_canonicalize (buf);
-			    strcpy (p, buf);
-			    p += strlen (buf);
-			    *p++ = ':';
-			    if (strcmp (buf, "en") == 0)
-			      break;
-			  }
-			else
-			  break;
-		      }
-		    *--p = '\0';
-
-		    cached_languages = languages;
-		  }
-	      }
-	  }
-	cache_initialized = 1;
-      }
-    if (cached_languages != NULL)
-      return cached_languages;
-  }
-#endif
-
-  return NULL;
-}
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
deleted file mode 100644
index ed25fe9f5..000000000
--- a/intl/libgnuintl.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers
-   used by programs.  Similarly, test __PROTOTYPES, not PROTOTYPES.  */
-#ifndef _INTL_PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define _INTL_PARAMS(args) args
-# else
-#  define _INTL_PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* We redirect the functions to those prefixed with "libintl_".  This is
-   necessary, because some systems define gettext/textdomain/... in the C
-   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-   If we used the unprefixed names, there would be cases where the
-   definition in the C library would override the one in the libintl.so
-   shared library.  Recall that on ELF systems, the symbols are looked
-   up in the following order:
-     1. in the executable,
-     2. in the shared libraries specified on the link command line, in order,
-     3. in the dependencies of the shared libraries specified on the link
-        command line,
-     4. in the dlopen()ed shared libraries, in the order in which they were
-        dlopen()ed.
-   The definition in the C library would override the one in libintl.so if
-   either
-     * -lc is given on the link command line and -lintl isn't, or
-     * -lc is given on the link command line before -lintl, or
-     * libintl.so is a dependency of a dlopen()ed shared library but not
-       linked to the executable at link time.
-   Since Solaris gettext() behaves differently than GNU gettext(), this
-   would be unacceptable.
-
-   The redirection happens by default through macros in C, so that &gettext
-   is independent of the compilation unit, but through inline functions in
-   C++, in order not to interfere with the name mangling of class fields or
-   class methods called 'gettext'.  */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-   If he doesn't, we choose the method.  A third possible method is
-   _INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid);
-static inline char *gettext (const char *__msgid)
-{
-  return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext _INTL_PARAMS ((const char *__msgid))
-       _INTL_ASM (libintl_gettext);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
-  return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext _INTL_PARAMS ((const char *__domainname,
-				     const char *__msgid))
-       _INTL_ASM (libintl_dgettext);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-				int __category);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
-			       int __category)
-{
-  return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext _INTL_PARAMS ((const char *__domainname,
-				      const char *__msgid,
-				      int __category))
-       _INTL_ASM (libintl_dcgettext);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-			      unsigned long int __n)
-{
-  return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext _INTL_PARAMS ((const char *__msgid1,
-				     const char *__msgid2,
-				     unsigned long int __n))
-       _INTL_ASM (libintl_ngettext);
-#endif
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
-			       const char *__msgid2, unsigned long int __n)
-{
-  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext _INTL_PARAMS ((const char *__domainname,
-				      const char *__msgid1,
-				      const char *__msgid2,
-				      unsigned long int __n))
-       _INTL_ASM (libintl_dngettext);
-#endif
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
-				 const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n, int __category);
-static inline char *dcngettext (const char *__domainname,
-				const char *__msgid1, const char *__msgid2,
-				unsigned long int __n, int __category)
-{
-  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext _INTL_PARAMS ((const char *__domainname,
-				       const char *__msgid1,
-				       const char *__msgid2,
-				       unsigned long int __n,
-				       int __category))
-       _INTL_ASM (libintl_dcngettext);
-#endif
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
-  return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain _INTL_PARAMS ((const char *__domainname))
-       _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
-				     const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
-				    const char *__dirname)
-{
-  return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname,
-					   const char *__dirname))
-       _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-					      const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
-					     const char *__codeset)
-{
-  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname,
-						    const char *__codeset))
-       _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
deleted file mode 100644
index 5e1ccd676..000000000
--- a/intl/libgnuintl.h.in
+++ /dev/null
@@ -1,419 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 || (major) == 1 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001000
-extern int libintl_version;
-
-
-/* We redirect the functions to those prefixed with "libintl_".  This is
-   necessary, because some systems define gettext/textdomain/... in the C
-   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-   If we used the unprefixed names, there would be cases where the
-   definition in the C library would override the one in the libintl.so
-   shared library.  Recall that on ELF systems, the symbols are looked
-   up in the following order:
-     1. in the executable,
-     2. in the shared libraries specified on the link command line, in order,
-     3. in the dependencies of the shared libraries specified on the link
-        command line,
-     4. in the dlopen()ed shared libraries, in the order in which they were
-        dlopen()ed.
-   The definition in the C library would override the one in libintl.so if
-   either
-     * -lc is given on the link command line and -lintl isn't, or
-     * -lc is given on the link command line before -lintl, or
-     * libintl.so is a dependency of a dlopen()ed shared library but not
-       linked to the executable at link time.
-   Since Solaris gettext() behaves differently than GNU gettext(), this
-   would be unacceptable.
-
-   The redirection happens by default through macros in C, so that &gettext
-   is independent of the compilation unit, but through inline functions in
-   C++, in order not to interfere with the name mangling of class fields or
-   class methods called 'gettext'.  */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-   If he doesn't, we choose the method.  A third possible method is
-   _INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-   its n-th argument literally.  This enables GCC to warn for example about
-   printf (gettext ("foo %y")).  */
-#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
-# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-#else
-# define _INTL_MAY_RETURN_STRING_ARG(n)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-static inline char *gettext (const char *__msgid)
-{
-  return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext (const char *__msgid)
-       _INTL_ASM (libintl_gettext)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
-  return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext (const char *__domainname, const char *__msgid)
-       _INTL_ASM (libintl_dgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-				int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
-			       int __category)
-{
-  return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext (const char *__domainname, const char *__msgid,
-			int __category)
-       _INTL_ASM (libintl_dcgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-			      unsigned long int __n)
-{
-  return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-		       unsigned long int __n)
-       _INTL_ASM (libintl_ngettext)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
-			       const char *__msgid2, unsigned long int __n)
-{
-  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext (const char *__domainname,
-			const char *__msgid1, const char *__msgid2,
-			unsigned long int __n)
-       _INTL_ASM (libintl_dngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
-				 const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n, int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dcngettext (const char *__domainname,
-				const char *__msgid1, const char *__msgid2,
-				unsigned long int __n, int __category)
-{
-  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext (const char *__domainname,
-			 const char *__msgid1, const char *__msgid2,
-			 unsigned long int __n, int __category)
-       _INTL_ASM (libintl_dcngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-
-#ifndef IN_LIBGLOCALE
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
-  return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain (const char *__domainname)
-       _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
-				     const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
-				    const char *__dirname)
-{
-  return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
-       _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-					      const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
-					     const char *__codeset)
-{
-  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset (const char *__domainname,
-				      const char *__codeset)
-       _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-#endif /* IN_LIBGLOCALE */
-
-
-/* Support for format strings with positions in *printf(), following the
-   POSIX/XSI specification.
-   Note: These replacements for the *printf() functions are visible only
-   in source files that #include <libintl.h> or #include "gettext.h".
-   Packages that use *printf() in source files that don't refer to _()
-   or gettext() but for which the format string could be the return value
-   of _() or gettext() need to add this #include.  Oh well.  */
-
-#if !@HAVE_POSIX_PRINTF@
-
-#include <stdio.h>
-#include <stddef.h>
-
-/* Get va_list.  */
-#if __STDC__ || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#undef fprintf
-#define fprintf libintl_fprintf
-extern int fprintf (FILE *, const char *, ...);
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-extern int vfprintf (FILE *, const char *, va_list);
-
-#undef printf
-#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
-/* Don't break __attribute__((format(printf,M,N))).
-   This redefinition is only possible because the libc in NetBSD, Cygwin,
-   mingw does not have a function __printf__.  */
-# define libintl_printf __printf__
-#endif
-#define printf libintl_printf
-extern int printf (const char *, ...);
-#undef vprintf
-#define vprintf libintl_vprintf
-extern int vprintf (const char *, va_list);
-
-#undef sprintf
-#define sprintf libintl_sprintf
-extern int sprintf (char *, const char *, ...);
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-extern int vsprintf (char *, const char *, va_list);
-
-#if @HAVE_SNPRINTF@
-
-#undef snprintf
-#define snprintf libintl_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list);
-
-#endif
-
-#if @HAVE_ASPRINTF@
-
-#undef asprintf
-#define asprintf libintl_asprintf
-extern int asprintf (char **, const char *, ...);
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-extern int vasprintf (char **, const char *, va_list);
-
-#endif
-
-#if @HAVE_WPRINTF@
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-extern int fwprintf (FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-extern int vfwprintf (FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-extern int wprintf (const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-extern int vwprintf (const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-/* Support for relocatable packages.  */
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-extern void
-       libintl_set_relocation_prefix (const char *orig_prefix,
-				      const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
deleted file mode 100644
index a7a197031..000000000
--- a/intl/loadinfo.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright (C) 1996-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <[email protected]>, 1996.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
-/* Declarations of locale dependent catalog lookup functions.
-   Implemented in
-
-     localealias.c    Possibly replace a locale name by another.
-     explodename.c    Split a locale name into its various fields.
-     l10nflist.c      Generate a list of filenames of possible message catalogs.
-     finddomain.c     Find and open the relevant message catalogs.
-
-   The main function _nl_find_domain() in finddomain.c is declared
-   in gettextP.h.
- */
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef LIBINTL_DLL_EXPORTED
-# define LIBINTL_DLL_EXPORTED
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames.  */
-#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
-  /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
-/* Encoding of locale name parts.  */
-#define XPG_NORM_CODESET	1
-#define XPG_CODESET		2
-#define XPG_TERRITORY		4
-#define XPG_MODIFIER		8
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-extern const char *_nl_normalize_codeset (const char *codeset,
-					  size_t name_len);
-
-/* Lookup a locale dependent file.
-   *L10NFILE_LIST denotes a pool of lookup results of locale dependent
-   files of the same kind, sorted in decreasing order of ->filename.
-   DIRLIST and DIRLIST_LEN are an argz list of directories in which to
-   look, containing at least one directory (i.e. DIRLIST_LEN > 0).
-   MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER
-   are the pieces of the locale name, as produced by _nl_explode_name().
-   FILENAME is the filename suffix.
-   The return value is the lookup result, either found in *L10NFILE_LIST,
-   or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
-   If the return value is non-NULL, it is added to *L10NFILE_LIST, and
-   its ->next field denotes the chaining inside *L10NFILE_LIST, and
-   furthermore its ->successor[] field contains a list of other lookup
-   results from which this lookup result inherits.  */
-extern struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
-		    const char *dirlist, size_t dirlist_len, int mask,
-		    const char *language, const char *territory,
-		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier,
-		    const char *filename, int do_allocate);
-
-/* Lookup the real locale name for a locale alias NAME, or NULL if
-   NAME is not a locale alias (but possibly a real locale name).
-   The return value is statically allocated and must not be freed.  */
-/* Part of the libintl ABI only for the sake of the gettext.m4 macro.  */
-extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name);
-
-/* Split a locale name NAME into its pieces: language, modifier,
-   territory, codeset.
-   NAME gets destructively modified: NUL bytes are inserted here and
-   there.  *LANGUAGE gets assigned NAME.  Each of *MODIFIER, *TERRITORY,
-   *CODESET gets assigned either a pointer into the old NAME string, or
-   NULL.  *NORMALIZED_CODESET gets assigned the expanded *CODESET, if it
-   is different from *CODESET; this one is dynamically allocated and has
-   to be freed by the caller.
-   The return value is a bitmask, where each bit corresponds to one
-   filled-in value:
-     XPG_MODIFIER                for *MODIFIER,
-     XPG_TERRITORY               for *TERRITORY,
-     XPG_CODESET                 for *CODESET,
-     XPG_NORM_CODESET            for *NORMALIZED_CODESET.
- */
-extern int _nl_explode_name (char *name, const char **language,
-			     const char **modifier, const char **territory,
-			     const char **codeset,
-			     const char **normalized_codeset);
-
-#endif	/* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
deleted file mode 100644
index 2520c8c21..000000000
--- a/intl/loadmsgcat.c
+++ /dev/null
@@ -1,1333 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef __GNUC__
-# undef  alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
-# include <sys/mman.h>
-# undef HAVE_MMAP
-# define HAVE_MMAP	1
-#else
-# undef HAVE_MMAP
-#endif
-
-#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
-# include <stdint.h>
-#endif
-#if defined HAVE_INTTYPES_H || defined _LIBC
-# include <inttypes.h>
-#endif
-
-#include "gmo.h"
-#include "gettextP.h"
-#include "hash-string.h"
-#include "plural-exp.h"
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-# include <not-cancel.h>
-#endif
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-# include "lock.h"
-#endif
-
-/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
-   Note that our fallback values need not be literal strings, because we don't
-   use them with preprocessor string concatenation.  */
-#if !defined PRId8 || PRI_MACROS_BROKEN
-# undef PRId8
-# define PRId8 "d"
-#endif
-#if !defined PRIi8 || PRI_MACROS_BROKEN
-# undef PRIi8
-# define PRIi8 "i"
-#endif
-#if !defined PRIo8 || PRI_MACROS_BROKEN
-# undef PRIo8
-# define PRIo8 "o"
-#endif
-#if !defined PRIu8 || PRI_MACROS_BROKEN
-# undef PRIu8
-# define PRIu8 "u"
-#endif
-#if !defined PRIx8 || PRI_MACROS_BROKEN
-# undef PRIx8
-# define PRIx8 "x"
-#endif
-#if !defined PRIX8 || PRI_MACROS_BROKEN
-# undef PRIX8
-# define PRIX8 "X"
-#endif
-#if !defined PRId16 || PRI_MACROS_BROKEN
-# undef PRId16
-# define PRId16 "d"
-#endif
-#if !defined PRIi16 || PRI_MACROS_BROKEN
-# undef PRIi16
-# define PRIi16 "i"
-#endif
-#if !defined PRIo16 || PRI_MACROS_BROKEN
-# undef PRIo16
-# define PRIo16 "o"
-#endif
-#if !defined PRIu16 || PRI_MACROS_BROKEN
-# undef PRIu16
-# define PRIu16 "u"
-#endif
-#if !defined PRIx16 || PRI_MACROS_BROKEN
-# undef PRIx16
-# define PRIx16 "x"
-#endif
-#if !defined PRIX16 || PRI_MACROS_BROKEN
-# undef PRIX16
-# define PRIX16 "X"
-#endif
-#if !defined PRId32 || PRI_MACROS_BROKEN
-# undef PRId32
-# define PRId32 "d"
-#endif
-#if !defined PRIi32 || PRI_MACROS_BROKEN
-# undef PRIi32
-# define PRIi32 "i"
-#endif
-#if !defined PRIo32 || PRI_MACROS_BROKEN
-# undef PRIo32
-# define PRIo32 "o"
-#endif
-#if !defined PRIu32 || PRI_MACROS_BROKEN
-# undef PRIu32
-# define PRIu32 "u"
-#endif
-#if !defined PRIx32 || PRI_MACROS_BROKEN
-# undef PRIx32
-# define PRIx32 "x"
-#endif
-#if !defined PRIX32 || PRI_MACROS_BROKEN
-# undef PRIX32
-# define PRIX32 "X"
-#endif
-#if !defined PRId64 || PRI_MACROS_BROKEN
-# undef PRId64
-# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
-#endif
-#if !defined PRIi64 || PRI_MACROS_BROKEN
-# undef PRIi64
-# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
-#endif
-#if !defined PRIo64 || PRI_MACROS_BROKEN
-# undef PRIo64
-# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
-#endif
-#if !defined PRIu64 || PRI_MACROS_BROKEN
-# undef PRIu64
-# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
-#endif
-#if !defined PRIx64 || PRI_MACROS_BROKEN
-# undef PRIx64
-# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
-#endif
-#if !defined PRIX64 || PRI_MACROS_BROKEN
-# undef PRIX64
-# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
-#endif
-#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
-# undef PRIdLEAST8
-# define PRIdLEAST8 "d"
-#endif
-#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
-# undef PRIiLEAST8
-# define PRIiLEAST8 "i"
-#endif
-#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
-# undef PRIoLEAST8
-# define PRIoLEAST8 "o"
-#endif
-#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
-# undef PRIuLEAST8
-# define PRIuLEAST8 "u"
-#endif
-#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
-# undef PRIxLEAST8
-# define PRIxLEAST8 "x"
-#endif
-#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
-# undef PRIXLEAST8
-# define PRIXLEAST8 "X"
-#endif
-#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
-# undef PRIdLEAST16
-# define PRIdLEAST16 "d"
-#endif
-#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
-# undef PRIiLEAST16
-# define PRIiLEAST16 "i"
-#endif
-#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
-# undef PRIoLEAST16
-# define PRIoLEAST16 "o"
-#endif
-#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
-# undef PRIuLEAST16
-# define PRIuLEAST16 "u"
-#endif
-#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
-# undef PRIxLEAST16
-# define PRIxLEAST16 "x"
-#endif
-#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
-# undef PRIXLEAST16
-# define PRIXLEAST16 "X"
-#endif
-#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
-# undef PRIdLEAST32
-# define PRIdLEAST32 "d"
-#endif
-#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
-# undef PRIiLEAST32
-# define PRIiLEAST32 "i"
-#endif
-#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
-# undef PRIoLEAST32
-# define PRIoLEAST32 "o"
-#endif
-#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
-# undef PRIuLEAST32
-# define PRIuLEAST32 "u"
-#endif
-#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
-# undef PRIxLEAST32
-# define PRIxLEAST32 "x"
-#endif
-#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
-# undef PRIXLEAST32
-# define PRIXLEAST32 "X"
-#endif
-#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
-# undef PRIdLEAST64
-# define PRIdLEAST64 PRId64
-#endif
-#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
-# undef PRIiLEAST64
-# define PRIiLEAST64 PRIi64
-#endif
-#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
-# undef PRIoLEAST64
-# define PRIoLEAST64 PRIo64
-#endif
-#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
-# undef PRIuLEAST64
-# define PRIuLEAST64 PRIu64
-#endif
-#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
-# undef PRIxLEAST64
-# define PRIxLEAST64 PRIx64
-#endif
-#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
-# undef PRIXLEAST64
-# define PRIXLEAST64 PRIX64
-#endif
-#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
-# undef PRIdFAST8
-# define PRIdFAST8 "d"
-#endif
-#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
-# undef PRIiFAST8
-# define PRIiFAST8 "i"
-#endif
-#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
-# undef PRIoFAST8
-# define PRIoFAST8 "o"
-#endif
-#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
-# undef PRIuFAST8
-# define PRIuFAST8 "u"
-#endif
-#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
-# undef PRIxFAST8
-# define PRIxFAST8 "x"
-#endif
-#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
-# undef PRIXFAST8
-# define PRIXFAST8 "X"
-#endif
-#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
-# undef PRIdFAST16
-# define PRIdFAST16 "d"
-#endif
-#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
-# undef PRIiFAST16
-# define PRIiFAST16 "i"
-#endif
-#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
-# undef PRIoFAST16
-# define PRIoFAST16 "o"
-#endif
-#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
-# undef PRIuFAST16
-# define PRIuFAST16 "u"
-#endif
-#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
-# undef PRIxFAST16
-# define PRIxFAST16 "x"
-#endif
-#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
-# undef PRIXFAST16
-# define PRIXFAST16 "X"
-#endif
-#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
-# undef PRIdFAST32
-# define PRIdFAST32 "d"
-#endif
-#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
-# undef PRIiFAST32
-# define PRIiFAST32 "i"
-#endif
-#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
-# undef PRIoFAST32
-# define PRIoFAST32 "o"
-#endif
-#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
-# undef PRIuFAST32
-# define PRIuFAST32 "u"
-#endif
-#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
-# undef PRIxFAST32
-# define PRIxFAST32 "x"
-#endif
-#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
-# undef PRIXFAST32
-# define PRIXFAST32 "X"
-#endif
-#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
-# undef PRIdFAST64
-# define PRIdFAST64 PRId64
-#endif
-#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
-# undef PRIiFAST64
-# define PRIiFAST64 PRIi64
-#endif
-#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
-# undef PRIoFAST64
-# define PRIoFAST64 PRIo64
-#endif
-#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
-# undef PRIuFAST64
-# define PRIuFAST64 PRIu64
-#endif
-#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
-# undef PRIxFAST64
-# define PRIxFAST64 PRIx64
-#endif
-#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
-# undef PRIXFAST64
-# define PRIXFAST64 PRIX64
-#endif
-#if !defined PRIdMAX || PRI_MACROS_BROKEN
-# undef PRIdMAX
-# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
-#endif
-#if !defined PRIiMAX || PRI_MACROS_BROKEN
-# undef PRIiMAX
-# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
-#endif
-#if !defined PRIoMAX || PRI_MACROS_BROKEN
-# undef PRIoMAX
-# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
-#endif
-#if !defined PRIuMAX || PRI_MACROS_BROKEN
-# undef PRIuMAX
-# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
-#endif
-#if !defined PRIxMAX || PRI_MACROS_BROKEN
-# undef PRIxMAX
-# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
-#endif
-#if !defined PRIXMAX || PRI_MACROS_BROKEN
-# undef PRIXMAX
-# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
-#endif
-#if !defined PRIdPTR || PRI_MACROS_BROKEN
-# undef PRIdPTR
-# define PRIdPTR \
-  (sizeof (void *) == sizeof (long) ? "ld" : \
-   sizeof (void *) == sizeof (int) ? "d" : \
-   "lld")
-#endif
-#if !defined PRIiPTR || PRI_MACROS_BROKEN
-# undef PRIiPTR
-# define PRIiPTR \
-  (sizeof (void *) == sizeof (long) ? "li" : \
-   sizeof (void *) == sizeof (int) ? "i" : \
-   "lli")
-#endif
-#if !defined PRIoPTR || PRI_MACROS_BROKEN
-# undef PRIoPTR
-# define PRIoPTR \
-  (sizeof (void *) == sizeof (long) ? "lo" : \
-   sizeof (void *) == sizeof (int) ? "o" : \
-   "llo")
-#endif
-#if !defined PRIuPTR || PRI_MACROS_BROKEN
-# undef PRIuPTR
-# define PRIuPTR \
-  (sizeof (void *) == sizeof (long) ? "lu" : \
-   sizeof (void *) == sizeof (int) ? "u" : \
-   "llu")
-#endif
-#if !defined PRIxPTR || PRI_MACROS_BROKEN
-# undef PRIxPTR
-# define PRIxPTR \
-  (sizeof (void *) == sizeof (long) ? "lx" : \
-   sizeof (void *) == sizeof (int) ? "x" : \
-   "llx")
-#endif
-#if !defined PRIXPTR || PRI_MACROS_BROKEN
-# undef PRIXPTR
-# define PRIXPTR \
-  (sizeof (void *) == sizeof (long) ? "lX" : \
-   sizeof (void *) == sizeof (int) ? "X" : \
-   "llX")
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open(name, flags)	open_not_cancel_2 (name, flags)
-# define close(fd)		close_not_cancel_no_status (fd)
-# define read(fd, buf, n)	read_not_cancel (fd, buf, n)
-# define mmap(addr, len, prot, flags, fd, offset) \
-  __mmap (addr, len, prot, flags, fd, offset)
-# define munmap(addr, len)	__munmap (addr, len)
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
-   O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
-
-
-/* Expand a system dependent string segment.  Return NULL if unsupported.  */
-static const char *
-get_sysdep_segment_value (const char *name)
-{
-  /* Test for an ISO C 99 section 7.8.1 format string directive.
-     Syntax:
-     P R I { d | i | o | u | x | X }
-     { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR }  */
-  /* We don't use a table of 14 times 6 'const char *' strings here, because
-     data relocations cost startup time.  */
-  if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
-    {
-      if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
-	  || name[3] == 'x' || name[3] == 'X')
-	{
-	  if (name[4] == '8' && name[5] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId8;
-	      if (name[3] == 'i')
-		return PRIi8;
-	      if (name[3] == 'o')
-		return PRIo8;
-	      if (name[3] == 'u')
-		return PRIu8;
-	      if (name[3] == 'x')
-		return PRIx8;
-	      if (name[3] == 'X')
-		return PRIX8;
-	      abort ();
-	    }
-	  if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId16;
-	      if (name[3] == 'i')
-		return PRIi16;
-	      if (name[3] == 'o')
-		return PRIo16;
-	      if (name[3] == 'u')
-		return PRIu16;
-	      if (name[3] == 'x')
-		return PRIx16;
-	      if (name[3] == 'X')
-		return PRIX16;
-	      abort ();
-	    }
-	  if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId32;
-	      if (name[3] == 'i')
-		return PRIi32;
-	      if (name[3] == 'o')
-		return PRIo32;
-	      if (name[3] == 'u')
-		return PRIu32;
-	      if (name[3] == 'x')
-		return PRIx32;
-	      if (name[3] == 'X')
-		return PRIX32;
-	      abort ();
-	    }
-	  if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId64;
-	      if (name[3] == 'i')
-		return PRIi64;
-	      if (name[3] == 'o')
-		return PRIo64;
-	      if (name[3] == 'u')
-		return PRIu64;
-	      if (name[3] == 'x')
-		return PRIx64;
-	      if (name[3] == 'X')
-		return PRIX64;
-	      abort ();
-	    }
-	  if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
-	      && name[7] == 'S' && name[8] == 'T')
-	    {
-	      if (name[9] == '8' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST8;
-		  if (name[3] == 'i')
-		    return PRIiLEAST8;
-		  if (name[3] == 'o')
-		    return PRIoLEAST8;
-		  if (name[3] == 'u')
-		    return PRIuLEAST8;
-		  if (name[3] == 'x')
-		    return PRIxLEAST8;
-		  if (name[3] == 'X')
-		    return PRIXLEAST8;
-		  abort ();
-		}
-	      if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST16;
-		  if (name[3] == 'i')
-		    return PRIiLEAST16;
-		  if (name[3] == 'o')
-		    return PRIoLEAST16;
-		  if (name[3] == 'u')
-		    return PRIuLEAST16;
-		  if (name[3] == 'x')
-		    return PRIxLEAST16;
-		  if (name[3] == 'X')
-		    return PRIXLEAST16;
-		  abort ();
-		}
-	      if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST32;
-		  if (name[3] == 'i')
-		    return PRIiLEAST32;
-		  if (name[3] == 'o')
-		    return PRIoLEAST32;
-		  if (name[3] == 'u')
-		    return PRIuLEAST32;
-		  if (name[3] == 'x')
-		    return PRIxLEAST32;
-		  if (name[3] == 'X')
-		    return PRIXLEAST32;
-		  abort ();
-		}
-	      if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST64;
-		  if (name[3] == 'i')
-		    return PRIiLEAST64;
-		  if (name[3] == 'o')
-		    return PRIoLEAST64;
-		  if (name[3] == 'u')
-		    return PRIuLEAST64;
-		  if (name[3] == 'x')
-		    return PRIxLEAST64;
-		  if (name[3] == 'X')
-		    return PRIXLEAST64;
-		  abort ();
-		}
-	    }
-	  if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
-	      && name[7] == 'T')
-	    {
-	      if (name[8] == '8' && name[9] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdFAST8;
-		  if (name[3] == 'i')
-		    return PRIiFAST8;
-		  if (name[3] == 'o')
-		    return PRIoFAST8;
-		  if (name[3] == 'u')
-		    return PRIuFAST8;
-		  if (name[3] == 'x')
-		    return PRIxFAST8;
-		  if (name[3] == 'X')
-		    return PRIXFAST8;
-		  abort ();
-		}
-	      if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdFAST16;
-		  if (name[3] == 'i')
-		    return PRIiFAST16;
-		  if (name[3] == 'o')
-		    return PRIoFAST16;
-		  if (name[3] == 'u')
-		    return PRIuFAST16;
-		  if (name[3] == 'x')
-		    return PRIxFAST16;
-		  if (name[3] == 'X')
-		    return PRIXFAST16;
-		  abort ();
-		}
-	      if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdFAST32;
-		  if (name[3] == 'i')
-		    return PRIiFAST32;
-		  if (name[3] == 'o')
-		    return PRIoFAST32;
-		  if (name[3] == 'u')
-		    return PRIuFAST32;
-		  if (name[3] == 'x')
-		    return PRIxFAST32;
-		  if (name[3] == 'X')
-		    return PRIXFAST32;
-		  abort ();
-		}
-	      if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdFAST64;
-		  if (name[3] == 'i')
-		    return PRIiFAST64;
-		  if (name[3] == 'o')
-		    return PRIoFAST64;
-		  if (name[3] == 'u')
-		    return PRIuFAST64;
-		  if (name[3] == 'x')
-		    return PRIxFAST64;
-		  if (name[3] == 'X')
-		    return PRIXFAST64;
-		  abort ();
-		}
-	    }
-	  if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
-	      && name[7] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRIdMAX;
-	      if (name[3] == 'i')
-		return PRIiMAX;
-	      if (name[3] == 'o')
-		return PRIoMAX;
-	      if (name[3] == 'u')
-		return PRIuMAX;
-	      if (name[3] == 'x')
-		return PRIxMAX;
-	      if (name[3] == 'X')
-		return PRIXMAX;
-	      abort ();
-	    }
-	  if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
-	      && name[7] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRIdPTR;
-	      if (name[3] == 'i')
-		return PRIiPTR;
-	      if (name[3] == 'o')
-		return PRIoPTR;
-	      if (name[3] == 'u')
-		return PRIuPTR;
-	      if (name[3] == 'x')
-		return PRIxPTR;
-	      if (name[3] == 'X')
-		return PRIXPTR;
-	      abort ();
-	    }
-	}
-    }
-  /* Test for a glibc specific printf() format directive flag.  */
-  if (name[0] == 'I' && name[1] == '\0')
-    {
-#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-      /* The 'I' flag, in numeric format directives, replaces ASCII digits
-	 with the 'outdigits' defined in the LC_CTYPE locale facet.  This is
-	 used for Farsi (Persian) and maybe Arabic.  */
-      return "I";
-#else
-      return "";
-#endif
-    }
-  /* Other system dependent strings are not valid.  */
-  return NULL;
-}
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (struct loaded_l10nfile *domain_file,
-		 struct binding *domainbinding)
-{
-  __libc_lock_define_initialized_recursive (static, lock)
-  int fd = -1;
-  size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
-  struct stat st;
-#endif
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-  int use_mmap = 0;
-  struct loaded_domain *domain;
-  int revision;
-  const char *nullentry;
-  size_t nullentrylen;
-
-  __libc_lock_lock_recursive (lock);
-  if (domain_file->decided != 0)
-    {
-      /* There are two possibilities:
-
-	 + this is the same thread calling again during this initialization
-	   via _nl_find_msg.  We have initialized everything this call needs.
-
-	 + this is another thread which tried to initialize this object.
-	   Not necessary anymore since if the lock is available this
-	   is finished.
-      */
-      goto done;
-    }
-
-  domain_file->decided = -1;
-  domain_file->data = NULL;
-
-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    goto out;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
-  if (fd == -1)
-    goto out;
-
-  /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
-    /* Something went wrong.  */
-    goto out;
-
-#ifdef HAVE_MMAP
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      fd = -1;
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	goto out;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
-	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
-	      goto out;
-	    }
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-      fd = -1;
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      goto out;
-    }
-
-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
-    goto out;
-  domain_file->data = domain;
-
-  domain->data = (char *) data;
-  domain->use_mmap = use_mmap;
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-  domain->malloced = NULL;
-
-  /* Fill in the information about the available tables.  */
-  revision = W (domain->must_swap, data->revision);
-  /* We support only the major revisions 0 and 1.  */
-  switch (revision >> 16)
-    {
-    case 0:
-    case 1:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (const struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (const struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab =
-	(domain->hash_size > 2
-	 ? (const nls_uint32 *)
-	   ((char *) data + W (domain->must_swap, data->hash_tab_offset))
-	 : NULL);
-      domain->must_swap_hash_tab = domain->must_swap;
-
-      /* Now dispatch on the minor revision.  */
-      switch (revision & 0xffff)
-	{
-	case 0:
-	  domain->n_sysdep_strings = 0;
-	  domain->orig_sysdep_tab = NULL;
-	  domain->trans_sysdep_tab = NULL;
-	  break;
-	case 1:
-	default:
-	  {
-	    nls_uint32 n_sysdep_strings;
-
-	    if (domain->hash_tab == NULL)
-	      /* This is invalid.  These minor revisions need a hash table.  */
-	      goto invalid;
-
-	    n_sysdep_strings =
-	      W (domain->must_swap, data->n_sysdep_strings);
-	    if (n_sysdep_strings > 0)
-	      {
-		nls_uint32 n_sysdep_segments;
-		const struct sysdep_segment *sysdep_segments;
-		const char **sysdep_segment_values;
-		const nls_uint32 *orig_sysdep_tab;
-		const nls_uint32 *trans_sysdep_tab;
-		nls_uint32 n_inmem_sysdep_strings;
-		size_t memneed;
-		char *mem;
-		struct sysdep_string_desc *inmem_orig_sysdep_tab;
-		struct sysdep_string_desc *inmem_trans_sysdep_tab;
-		nls_uint32 *inmem_hash_tab;
-		unsigned int i, j;
-
-		/* Get the values of the system dependent segments.  */
-		n_sysdep_segments =
-		  W (domain->must_swap, data->n_sysdep_segments);
-		sysdep_segments = (const struct sysdep_segment *)
-		  ((char *) data
-		   + W (domain->must_swap, data->sysdep_segments_offset));
-		sysdep_segment_values =
-		  alloca (n_sysdep_segments * sizeof (const char *));
-		for (i = 0; i < n_sysdep_segments; i++)
-		  {
-		    const char *name =
-		      (char *) data
-		      + W (domain->must_swap, sysdep_segments[i].offset);
-		    nls_uint32 namelen =
-		      W (domain->must_swap, sysdep_segments[i].length);
-
-		    if (!(namelen > 0 && name[namelen - 1] == '\0'))
-		      {
-			freea (sysdep_segment_values);
-			goto invalid;
-		      }
-
-		    sysdep_segment_values[i] = get_sysdep_segment_value (name);
-		  }
-
-		orig_sysdep_tab = (const nls_uint32 *)
-		  ((char *) data
-		   + W (domain->must_swap, data->orig_sysdep_tab_offset));
-		trans_sysdep_tab = (const nls_uint32 *)
-		  ((char *) data
-		   + W (domain->must_swap, data->trans_sysdep_tab_offset));
-
-		/* Compute the amount of additional memory needed for the
-		   system dependent strings and the augmented hash table.
-		   At the same time, also drop string pairs which refer to
-		   an undefined system dependent segment.  */
-		n_inmem_sysdep_strings = 0;
-		memneed = domain->hash_size * sizeof (nls_uint32);
-		for (i = 0; i < n_sysdep_strings; i++)
-		  {
-		    int valid = 1;
-		    size_t needs[2];
-
-		    for (j = 0; j < 2; j++)
-		      {
-			const struct sysdep_string *sysdep_string =
-			  (const struct sysdep_string *)
-			  ((char *) data
-			   + W (domain->must_swap,
-				j == 0
-				? orig_sysdep_tab[i]
-				: trans_sysdep_tab[i]));
-			size_t need = 0;
-			const struct segment_pair *p = sysdep_string->segments;
-
-			if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
-			  for (p = sysdep_string->segments;; p++)
-			    {
-			      nls_uint32 sysdepref;
-
-			      need += W (domain->must_swap, p->segsize);
-
-			      sysdepref = W (domain->must_swap, p->sysdepref);
-			      if (sysdepref == SEGMENTS_END)
-				break;
-
-			      if (sysdepref >= n_sysdep_segments)
-				{
-				  /* Invalid.  */
-				  freea (sysdep_segment_values);
-				  goto invalid;
-				}
-
-			      if (sysdep_segment_values[sysdepref] == NULL)
-				{
-				  /* This particular string pair is invalid.  */
-				  valid = 0;
-				  break;
-				}
-
-			      need += strlen (sysdep_segment_values[sysdepref]);
-			    }
-
-			needs[j] = need;
-			if (!valid)
-			  break;
-		      }
-
-		    if (valid)
-		      {
-			n_inmem_sysdep_strings++;
-			memneed += needs[0] + needs[1];
-		      }
-		  }
-		memneed += 2 * n_inmem_sysdep_strings
-			   * sizeof (struct sysdep_string_desc);
-
-		if (n_inmem_sysdep_strings > 0)
-		  {
-		    unsigned int k;
-
-		    /* Allocate additional memory.  */
-		    mem = (char *) malloc (memneed);
-		    if (mem == NULL)
-		      goto invalid;
-
-		    domain->malloced = mem;
-		    inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
-		    mem += n_inmem_sysdep_strings
-			   * sizeof (struct sysdep_string_desc);
-		    inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
-		    mem += n_inmem_sysdep_strings
-			   * sizeof (struct sysdep_string_desc);
-		    inmem_hash_tab = (nls_uint32 *) mem;
-		    mem += domain->hash_size * sizeof (nls_uint32);
-
-		    /* Compute the system dependent strings.  */
-		    k = 0;
-		    for (i = 0; i < n_sysdep_strings; i++)
-		      {
-			int valid = 1;
-
-			for (j = 0; j < 2; j++)
-			  {
-			    const struct sysdep_string *sysdep_string =
-			      (const struct sysdep_string *)
-			      ((char *) data
-			       + W (domain->must_swap,
-				    j == 0
-				    ? orig_sysdep_tab[i]
-				    : trans_sysdep_tab[i]));
-			    const struct segment_pair *p =
-			      sysdep_string->segments;
-
-			    if (W (domain->must_swap, p->sysdepref)
-				!= SEGMENTS_END)
-			      for (p = sysdep_string->segments;; p++)
-				{
-				  nls_uint32 sysdepref;
-
-				  sysdepref =
-				    W (domain->must_swap, p->sysdepref);
-				  if (sysdepref == SEGMENTS_END)
-				    break;
-
-				  if (sysdep_segment_values[sysdepref] == NULL)
-				    {
-				      /* This particular string pair is
-					 invalid.  */
-				      valid = 0;
-				      break;
-				    }
-				}
-
-			    if (!valid)
-			      break;
-			  }
-
-			if (valid)
-			  {
-			    for (j = 0; j < 2; j++)
-			      {
-				const struct sysdep_string *sysdep_string =
-				  (const struct sysdep_string *)
-				  ((char *) data
-				   + W (domain->must_swap,
-					j == 0
-					? orig_sysdep_tab[i]
-					: trans_sysdep_tab[i]));
-				const char *static_segments =
-				  (char *) data
-				  + W (domain->must_swap, sysdep_string->offset);
-				const struct segment_pair *p =
-				  sysdep_string->segments;
-
-				/* Concatenate the segments, and fill
-				   inmem_orig_sysdep_tab[k] (for j == 0) and
-				   inmem_trans_sysdep_tab[k] (for j == 1).  */
-
-				struct sysdep_string_desc *inmem_tab_entry =
-				  (j == 0
-				   ? inmem_orig_sysdep_tab
-				   : inmem_trans_sysdep_tab)
-				  + k;
-
-				if (W (domain->must_swap, p->sysdepref)
-				    == SEGMENTS_END)
-				  {
-				    /* Only one static segment.  */
-				    inmem_tab_entry->length =
-				      W (domain->must_swap, p->segsize);
-				    inmem_tab_entry->pointer = static_segments;
-				  }
-				else
-				  {
-				    inmem_tab_entry->pointer = mem;
-
-				    for (p = sysdep_string->segments;; p++)
-				      {
-					nls_uint32 segsize =
-					  W (domain->must_swap, p->segsize);
-					nls_uint32 sysdepref =
-					  W (domain->must_swap, p->sysdepref);
-					size_t n;
-
-					if (segsize > 0)
-					  {
-					    memcpy (mem, static_segments, segsize);
-					    mem += segsize;
-					    static_segments += segsize;
-					  }
-
-					if (sysdepref == SEGMENTS_END)
-					  break;
-
-					n = strlen (sysdep_segment_values[sysdepref]);
-					memcpy (mem, sysdep_segment_values[sysdepref], n);
-					mem += n;
-				      }
-
-				    inmem_tab_entry->length =
-				      mem - inmem_tab_entry->pointer;
-				  }
-			      }
-
-			    k++;
-			  }
-		      }
-		    if (k != n_inmem_sysdep_strings)
-		      abort ();
-
-		    /* Compute the augmented hash table.  */
-		    for (i = 0; i < domain->hash_size; i++)
-		      inmem_hash_tab[i] =
-			W (domain->must_swap_hash_tab, domain->hash_tab[i]);
-		    for (i = 0; i < n_inmem_sysdep_strings; i++)
-		      {
-			const char *msgid = inmem_orig_sysdep_tab[i].pointer;
-			nls_uint32 hash_val = __hash_string (msgid);
-			nls_uint32 idx = hash_val % domain->hash_size;
-			nls_uint32 incr =
-			  1 + (hash_val % (domain->hash_size - 2));
-
-			for (;;)
-			  {
-			    if (inmem_hash_tab[idx] == 0)
-			      {
-				/* Hash table entry is empty.  Use it.  */
-				inmem_hash_tab[idx] = 1 + domain->nstrings + i;
-				break;
-			      }
-
-			    if (idx >= domain->hash_size - incr)
-			      idx -= domain->hash_size - incr;
-			    else
-			      idx += incr;
-			  }
-		      }
-
-		    domain->n_sysdep_strings = n_inmem_sysdep_strings;
-		    domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
-		    domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
-
-		    domain->hash_tab = inmem_hash_tab;
-		    domain->must_swap_hash_tab = 0;
-		  }
-		else
-		  {
-		    domain->n_sysdep_strings = 0;
-		    domain->orig_sysdep_tab = NULL;
-		    domain->trans_sysdep_tab = NULL;
-		  }
-
-		freea (sysdep_segment_values);
-	      }
-	    else
-	      {
-		domain->n_sysdep_strings = 0;
-		domain->orig_sysdep_tab = NULL;
-		domain->trans_sysdep_tab = NULL;
-	      }
-	  }
-	  break;
-	}
-      break;
-    default:
-      /* This is an invalid revision.  */
-    invalid:
-      /* This is an invalid .mo file.  */
-      if (domain->malloced)
-	free (domain->malloced);
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      goto out;
-    }
-
-  /* No caches of converted translations so far.  */
-  domain->conversions = NULL;
-  domain->nconversions = 0;
-
-  /* Get the header entry and look for a plural specification.  */
-#ifdef IN_LIBGLOCALE
-  nullentry =
-    _nl_find_msg (domain_file, domainbinding, NULL, "", &nullentrylen);
-#else
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
-#endif
-  EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
-
- out:
-  if (fd != -1)
-    close (fd);
-
-  domain_file->decided = 1;
-
- done:
-  __libc_lock_unlock_recursive (lock);
-}
-
-
-#ifdef _LIBC
-void
-internal_function __libc_freeres_fn_section
-_nl_unload_domain (struct loaded_domain *domain)
-{
-  size_t i;
-
-  if (domain->plural != &__gettext_germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  for (i = 0; i < domain->nconversions; i++)
-    {
-      struct converted_domain *convd = &domain->conversions[i];
-
-      free (convd->encoding);
-      if (convd->conv_tab != NULL && convd->conv_tab != (char **) -1)
-	free (convd->conv_tab);
-      if (convd->conv != (__gconv_t) -1)
-	__gconv_close (convd->conv);
-    }
-  if (domain->conversions != NULL)
-    free (domain->conversions);
-
-  if (domain->malloced)
-    free (domain->malloced);
-
-# ifdef _POSIX_MAPPED_FILES
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-# endif	/* _POSIX_MAPPED_FILES */
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/intl/localcharset.c b/intl/localcharset.c
deleted file mode 100644
index e796ae71c..000000000
--- a/intl/localcharset.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <[email protected]>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "localcharset.h"
-
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if defined _WIN32 || defined __WIN32__
-# define WIN32_NATIVE
-#endif
-
-#if defined __EMX__
-/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
-# define OS2
-#endif
-
-#if !defined WIN32_NATIVE
-# if HAVE_LANGINFO_CODESET
-#  include <langinfo.h>
-# else
-#  if 0 /* see comment below */
-#   include <locale.h>
-#  endif
-# endif
-# ifdef __CYGWIN__
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-# endif
-#elif defined WIN32_NATIVE
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-#if defined OS2
-# define INCL_DOS
-# include <os2.h>
-#endif
-
-#if ENABLE_RELOCATABLE
-# include "relocatable.h"
-#else
-# define relocate(pathname) (pathname)
-#endif
-
-/* Get LIBDIR.  */
-#ifndef LIBDIR
-# include "configmake.h"
-#endif
-
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-#if HAVE_DECL_GETC_UNLOCKED
-# undef getc
-# define getc getc_unlocked
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
-   possible multithread problem in the function get_charset_aliases. If we
-   are running in a threaded environment, and if two threads initialize
-   'charset_aliases' simultaneously, both will produce the same value,
-   and everything will be ok if the two assignments to 'charset_aliases'
-   are atomic. But I don't know what will happen if the two assignments mix.  */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
-   read, else NULL.  Its format is:
-   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static const char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file.  */
-static const char *
-get_charset_aliases (void)
-{
-  const char *cp;
-
-  cp = charset_aliases;
-  if (cp == NULL)
-    {
-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
-      FILE *fp;
-      const char *dir;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Make it possible to override the charset.alias location.  This is
-	 necessary for running the testsuite before "make install".  */
-      dir = getenv ("CHARSETALIASDIR");
-      if (dir == NULL || dir[0] == '\0')
-	dir = relocate (LIBDIR);
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
-      }
-
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-
-	  for (;;)
-	    {
-	      int c;
-	      char buf1[50+1];
-	      char buf2[50+1];
-	      size_t l1, l2;
-	      char *old_res_ptr;
-
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      old_res_ptr = res_ptr;
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = (char *) malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  if (old_res_ptr != NULL)
-		    free (old_res_ptr);
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";
-	  else
-	    {
-	      *(res_ptr + res_size) = '\0';
-	      cp = res_ptr;
-	    }
-	}
-
-      if (file_name != NULL)
-	free (file_name);
-
-#else
-
-# if defined VMS
-      /* To avoid the troubles of an extra file charset.alias_vms in the
-	 sources of many GNU packages, simply inline the aliases here.  */
-      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
-	 "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
-	 section 10.7 "Handling Different Character Sets".  */
-      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
-	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
-	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
-	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
-	   "ISO8859-8" "\0" "ISO-8859-8" "\0"
-	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
-	   /* Japanese */
-	   "eucJP" "\0" "EUC-JP" "\0"
-	   "SJIS" "\0" "SHIFT_JIS" "\0"
-	   "DECKANJI" "\0" "DEC-KANJI" "\0"
-	   "SDECKANJI" "\0" "EUC-JP" "\0"
-	   /* Chinese */
-	   "eucTW" "\0" "EUC-TW" "\0"
-	   "DECHANYU" "\0" "DEC-HANYU" "\0"
-	   "DECHANZI" "\0" "GB2312" "\0"
-	   /* Korean */
-	   "DECKOREAN" "\0" "EUC-KR" "\0";
-# endif
-
-# if defined WIN32_NATIVE || defined __CYGWIN__
-      /* To avoid the troubles of installing a separate file in the same
-	 directory as the DLL and of retrieving the DLL's directory at
-	 runtime, simply inline the aliases here.  */
-
-      cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0"
-	   "CP20127" "\0" "ASCII" "\0"
-	   "CP20866" "\0" "KOI8-R" "\0"
-	   "CP20936" "\0" "GB2312" "\0"
-	   "CP21866" "\0" "KOI8-RU" "\0"
-	   "CP28591" "\0" "ISO-8859-1" "\0"
-	   "CP28592" "\0" "ISO-8859-2" "\0"
-	   "CP28593" "\0" "ISO-8859-3" "\0"
-	   "CP28594" "\0" "ISO-8859-4" "\0"
-	   "CP28595" "\0" "ISO-8859-5" "\0"
-	   "CP28596" "\0" "ISO-8859-6" "\0"
-	   "CP28597" "\0" "ISO-8859-7" "\0"
-	   "CP28598" "\0" "ISO-8859-8" "\0"
-	   "CP28599" "\0" "ISO-8859-9" "\0"
-	   "CP28605" "\0" "ISO-8859-15" "\0"
-	   "CP38598" "\0" "ISO-8859-8" "\0"
-	   "CP51932" "\0" "EUC-JP" "\0"
-	   "CP51936" "\0" "GB2312" "\0"
-	   "CP51949" "\0" "EUC-KR" "\0"
-	   "CP51950" "\0" "EUC-TW" "\0"
-	   "CP54936" "\0" "GB18030" "\0"
-	   "CP65001" "\0" "UTF-8" "\0";
-# endif
-#endif
-
-      charset_aliases = cp;
-    }
-
-  return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset (void)
-{
-  const char *codeset;
-  const char *aliases;
-
-#if !(defined WIN32_NATIVE || defined OS2)
-
-# if HAVE_LANGINFO_CODESET
-
-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-  codeset = nl_langinfo (CODESET);
-
-#  ifdef __CYGWIN__
-  /* Cygwin 2006 does not have locales.  nl_langinfo (CODESET) always
-     returns "US-ASCII".  As long as this is not fixed, return the suffix
-     of the locale name from the environment variables (if present) or
-     the codepage as a number.  */
-  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
-    {
-      const char *locale;
-      static char buf[2 + 10 + 1];
-
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-      if (locale != NULL && locale[0] != '\0')
-	{
-	  /* If the locale name contains an encoding after the dot, return
-	     it.  */
-	  const char *dot = strchr (locale, '.');
-
-	  if (dot != NULL)
-	    {
-	      const char *modifier;
-
-	      dot++;
-	      /* Look for the possible @... trailer and remove it, if any.  */
-	      modifier = strchr (dot, '@');
-	      if (modifier == NULL)
-		return dot;
-	      if (modifier - dot < sizeof (buf))
-		{
-		  memcpy (buf, dot, modifier - dot);
-		  buf [modifier - dot] = '\0';
-		  return buf;
-		}
-	    }
-	}
-
-      /* Woe32 has a function returning the locale's codepage as a number.  */
-      sprintf (buf, "CP%u", GetACP ());
-      codeset = buf;
-    }
-#  endif
-
-# else
-
-  /* On old systems which lack it, use setlocale or getenv.  */
-  const char *locale = NULL;
-
-  /* But most old systems don't have a complete set of locales.  Some
-     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-     use setlocale here; it would return "C" when it doesn't support the
-     locale name the user has set.  */
-#  if 0
-  locale = setlocale (LC_CTYPE, NULL);
-#  endif
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-    }
-
-  /* On some old systems, one used to set locale = "iso8859_1". On others,
-     you set it to "language_COUNTRY.charset". In any case, we resolve it
-     through the charset.alias file.  */
-  codeset = locale;
-
-# endif
-
-#elif defined WIN32_NATIVE
-
-  static char buf[2 + 10 + 1];
-
-  /* Woe32 has a function returning the locale's codepage as a number.  */
-  sprintf (buf, "CP%u", GetACP ());
-  codeset = buf;
-
-#elif defined OS2
-
-  const char *locale;
-  static char buf[2 + 10 + 1];
-  ULONG cp[3];
-  ULONG cplen;
-
-  /* Allow user to override the codeset, as set in the operating system,
-     with standard language environment variables.  */
-  locale = getenv ("LC_ALL");
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_CTYPE");
-      if (locale == NULL || locale[0] == '\0')
-	locale = getenv ("LANG");
-    }
-  if (locale != NULL && locale[0] != '\0')
-    {
-      /* If the locale name contains an encoding after the dot, return it.  */
-      const char *dot = strchr (locale, '.');
-
-      if (dot != NULL)
-	{
-	  const char *modifier;
-
-	  dot++;
-	  /* Look for the possible @... trailer and remove it, if any.  */
-	  modifier = strchr (dot, '@');
-	  if (modifier == NULL)
-	    return dot;
-	  if (modifier - dot < sizeof (buf))
-	    {
-	      memcpy (buf, dot, modifier - dot);
-	      buf [modifier - dot] = '\0';
-	      return buf;
-	    }
-	}
-
-      /* Resolve through the charset.alias file.  */
-      codeset = locale;
-    }
-  else
-    {
-      /* OS/2 has a function returning the locale's codepage as a number.  */
-      if (DosQueryCp (sizeof (cp), cp, &cplen))
-	codeset = "";
-      else
-	{
-	  sprintf (buf, "CP%u", cp[0]);
-	  codeset = buf;
-	}
-    }
-
-#endif
-
-  if (codeset == NULL)
-    /* The canonical name cannot be determined.  */
-    codeset = "";
-
-  /* Resolve alias. */
-  for (aliases = get_charset_aliases ();
-       *aliases != '\0';
-       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-    if (strcmp (codeset, aliases) == 0
-	|| (aliases[0] == '*' && aliases[1] == '\0'))
-      {
-	codeset = aliases + strlen (aliases) + 1;
-	break;
-      }
-
-  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
-     the empty string as denoting "the locale's character encoding",
-     thus GNU libiconv would call this function a second time.  */
-  if (codeset[0] == '\0')
-    codeset = "ASCII";
-
-  return codeset;
-}
diff --git a/intl/localcharset.h b/intl/localcharset.h
deleted file mode 100644
index 129e4a4a3..000000000
--- a/intl/localcharset.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
-   This file is part of the GNU CHARSET Library.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _LOCALCHARSET_H
-#define _LOCALCHARSET_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-extern const char * locale_charset (void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _LOCALCHARSET_H */
diff --git a/intl/locale.alias b/intl/locale.alias
deleted file mode 100644
index faa696918..000000000
--- a/intl/locale.alias
+++ /dev/null
@@ -1,78 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library 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.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# [email protected].
-
-# Packages using this file: 
-
-bokmal		nb_NO.ISO-8859-1
-bokm�l		nb_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-fran�ais	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          he_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-no_NO		nb_NO.ISO-8859-1
-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
-norwegian       nb_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9
diff --git a/intl/localealias.c b/intl/localealias.c
deleted file mode 100644
index 26122a011..000000000
--- a/intl/localealias.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#if defined _LIBC || defined HAVE___FSETLOCKING
-# include <stdio_ext.h>
-#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# undef alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "gettextP.h"
-
-#if ENABLE_RELOCATABLE
-# include "relocatable.h"
-#else
-# define relocate(pathname) (pathname)
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# ifndef mempcpy
-#  define mempcpy __mempcpy
-# endif
-# define HAVE_MEMPCPY	1
-# define HAVE___FSETLOCKING	1
-#endif
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-# include "lock.h"
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Some optimizations for glibc.  */
-#ifdef _LIBC
-# define FEOF(fp)		feof_unlocked (fp)
-# define FGETS(buf, n, fp)	fgets_unlocked (buf, n, fp)
-#else
-# define FEOF(fp)		feof (fp)
-# define FGETS(buf, n, fp)	fgets (buf, n, fp)
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
-# undef feof
-# define feof(s) feof_unlocked (s)
-#endif
-
-
-__libc_lock_define_initialized (static, lock)
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-#ifndef _LIBC
-# define libc_freeres_ptr(decl) decl
-#endif
-
-libc_freeres_ptr (static char *string_space);
-static size_t string_space_act;
-static size_t string_space_max;
-libc_freeres_ptr (static struct alias_map *map);
-static size_t nmap;
-static size_t maxmap;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file (const char *fname, int fname_len)
-     internal_function;
-static int extend_alias_table (void);
-static int alias_compare (const struct alias_map *map1,
-			  const struct alias_map *map2);
-
-
-const char *
-_nl_expand_alias (const char *name)
-{
-  static const char *locale_alias_path;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-  __libc_lock_lock (lock);
-
-  if (locale_alias_path == NULL)
-    locale_alias_path = LOCALE_ALIAS_PATH;
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) (const void *,
-							 const void *)
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == PATH_SEPARATOR)
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-  __libc_lock_unlock (lock);
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (const char *fname, int fname_len)
-{
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-#ifdef _LIBC
-  /* Note the file is opened with cancellation in the I/O functions
-     disabled.  */
-  fp = fopen (relocate (full_fname), "rc");
-#else
-  fp = fopen (relocate (full_fname), "r");
-#endif
-  freea (full_fname);
-  if (fp == NULL)
-    return 0;
-
-#ifdef HAVE___FSETLOCKING
-  /* No threads present.  */
-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
-#endif
-
-  added = 0;
-  while (!FEOF (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-	 We avoid a multi-kilobyte buffer here since this would use up
-	 stack space which we might not have if the program ran out of
-	 memory.  */
-      char buf[400];
-      char *alias;
-      char *value;
-      char *cp;
-      int complete_line;
-
-      if (FGETS (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Determine whether the line is complete.  */
-      complete_line = strchr (buf, '\n') != NULL;
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace ((unsigned char) cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace ((unsigned char) cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-#ifdef IN_LIBGLOCALE
-	      /* glibc's locale.alias contains entries for ja_JP and ko_KR
-		 that make it impossible to use a Japanese or Korean UTF-8
-		 locale under the name "ja_JP" or "ko_KR".  Ignore these
-		 entries.  */
-	      if (strchr (alias, '_') == NULL)
-#endif
-		{
-		  size_t alias_len;
-		  size_t value_len;
-
-		  if (nmap >= maxmap)
-		    if (__builtin_expect (extend_alias_table (), 0))
-		      goto out;
-
-		  alias_len = strlen (alias) + 1;
-		  value_len = strlen (value) + 1;
-
-		  if (string_space_act + alias_len + value_len > string_space_max)
-		    {
-		      /* Increase size of memory pool.  */
-		      size_t new_size = (string_space_max
-					 + (alias_len + value_len > 1024
-					    ? alias_len + value_len : 1024));
-		      char *new_pool = (char *) realloc (string_space, new_size);
-		      if (new_pool == NULL)
-			goto out;
-
-		      if (__builtin_expect (string_space != new_pool, 0))
-			{
-			  size_t i;
-
-			  for (i = 0; i < nmap; i++)
-			    {
-			      map[i].alias += new_pool - string_space;
-			      map[i].value += new_pool - string_space;
-			    }
-			}
-
-		      string_space = new_pool;
-		      string_space_max = new_size;
-		    }
-
-		  map[nmap].alias = memcpy (&string_space[string_space_act],
-					    alias, alias_len);
-		  string_space_act += alias_len;
-
-		  map[nmap].value = memcpy (&string_space[string_space_act],
-					    value, value_len);
-		  string_space_act += value_len;
-
-		  ++nmap;
-		  ++added;
-		}
-	    }
-	}
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (! complete_line)
-	do
-	  if (FGETS (buf, sizeof buf, fp) == NULL)
-	    /* Make sure the inner loop will be left.  The outer loop
-	       will exit at the `feof' test.  */
-	    break;
-	while (strchr (buf, '\n') == NULL);
-    }
-
- out:
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) (const void *, const void *)) alias_compare);
-
-  return added;
-}
-
-
-static int
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return -1;
-
-  map = new_map;
-  maxmap = new_size;
-  return 0;
-}
-
-
-static int
-alias_compare (const struct alias_map *map1, const struct alias_map *map2)
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/intl/localename.c b/intl/localename.c
deleted file mode 100644
index e1b4615a0..000000000
--- a/intl/localename.c
+++ /dev/null
@@ -1,1499 +0,0 @@
-/* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Ulrich Drepper <[email protected]>, 1995.  */
-/* Win32 code written by Tor Lillqvist <[email protected]>.  */
-/* MacOS X code written by Bruno Haible <[email protected]>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <locale.h>
-
-#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-# include <string.h>
-# include <CoreFoundation/CFString.h>
-# if HAVE_CFLOCALECOPYCURRENT
-#  include <CoreFoundation/CFLocale.h>
-# elif HAVE_CFPREFERENCESCOPYAPPVALUE
-#  include <CoreFoundation/CFPreferences.h>
-# endif
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# define WIN32_NATIVE
-#endif
-
-#ifdef WIN32_NATIVE
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-/* List of language codes, sorted by value:
-   0x01 LANG_ARABIC
-   0x02 LANG_BULGARIAN
-   0x03 LANG_CATALAN
-   0x04 LANG_CHINESE
-   0x05 LANG_CZECH
-   0x06 LANG_DANISH
-   0x07 LANG_GERMAN
-   0x08 LANG_GREEK
-   0x09 LANG_ENGLISH
-   0x0a LANG_SPANISH
-   0x0b LANG_FINNISH
-   0x0c LANG_FRENCH
-   0x0d LANG_HEBREW
-   0x0e LANG_HUNGARIAN
-   0x0f LANG_ICELANDIC
-   0x10 LANG_ITALIAN
-   0x11 LANG_JAPANESE
-   0x12 LANG_KOREAN
-   0x13 LANG_DUTCH
-   0x14 LANG_NORWEGIAN
-   0x15 LANG_POLISH
-   0x16 LANG_PORTUGUESE
-   0x17 LANG_RHAETO_ROMANCE
-   0x18 LANG_ROMANIAN
-   0x19 LANG_RUSSIAN
-   0x1a LANG_CROATIAN == LANG_SERBIAN
-   0x1b LANG_SLOVAK
-   0x1c LANG_ALBANIAN
-   0x1d LANG_SWEDISH
-   0x1e LANG_THAI
-   0x1f LANG_TURKISH
-   0x20 LANG_URDU
-   0x21 LANG_INDONESIAN
-   0x22 LANG_UKRAINIAN
-   0x23 LANG_BELARUSIAN
-   0x24 LANG_SLOVENIAN
-   0x25 LANG_ESTONIAN
-   0x26 LANG_LATVIAN
-   0x27 LANG_LITHUANIAN
-   0x28 LANG_TAJIK
-   0x29 LANG_FARSI
-   0x2a LANG_VIETNAMESE
-   0x2b LANG_ARMENIAN
-   0x2c LANG_AZERI
-   0x2d LANG_BASQUE
-   0x2e LANG_SORBIAN
-   0x2f LANG_MACEDONIAN
-   0x30 LANG_SUTU
-   0x31 LANG_TSONGA
-   0x32 LANG_TSWANA
-   0x33 LANG_VENDA
-   0x34 LANG_XHOSA
-   0x35 LANG_ZULU
-   0x36 LANG_AFRIKAANS
-   0x37 LANG_GEORGIAN
-   0x38 LANG_FAEROESE
-   0x39 LANG_HINDI
-   0x3a LANG_MALTESE
-   0x3b LANG_SAAMI
-   0x3c LANG_GAELIC
-   0x3d LANG_YIDDISH
-   0x3e LANG_MALAY
-   0x3f LANG_KAZAK
-   0x40 LANG_KYRGYZ
-   0x41 LANG_SWAHILI
-   0x42 LANG_TURKMEN
-   0x43 LANG_UZBEK
-   0x44 LANG_TATAR
-   0x45 LANG_BENGALI
-   0x46 LANG_PUNJABI
-   0x47 LANG_GUJARATI
-   0x48 LANG_ORIYA
-   0x49 LANG_TAMIL
-   0x4a LANG_TELUGU
-   0x4b LANG_KANNADA
-   0x4c LANG_MALAYALAM
-   0x4d LANG_ASSAMESE
-   0x4e LANG_MARATHI
-   0x4f LANG_SANSKRIT
-   0x50 LANG_MONGOLIAN
-   0x51 LANG_TIBETAN
-   0x52 LANG_WELSH
-   0x53 LANG_CAMBODIAN
-   0x54 LANG_LAO
-   0x55 LANG_BURMESE
-   0x56 LANG_GALICIAN
-   0x57 LANG_KONKANI
-   0x58 LANG_MANIPURI
-   0x59 LANG_SINDHI
-   0x5a LANG_SYRIAC
-   0x5b LANG_SINHALESE
-   0x5c LANG_CHEROKEE
-   0x5d LANG_INUKTITUT
-   0x5e LANG_AMHARIC
-   0x5f LANG_TAMAZIGHT
-   0x60 LANG_KASHMIRI
-   0x61 LANG_NEPALI
-   0x62 LANG_FRISIAN
-   0x63 LANG_PASHTO
-   0x64 LANG_TAGALOG
-   0x65 LANG_DIVEHI
-   0x66 LANG_EDO
-   0x67 LANG_FULFULDE
-   0x68 LANG_HAUSA
-   0x69 LANG_IBIBIO
-   0x6a LANG_YORUBA
-   0x70 LANG_IGBO
-   0x71 LANG_KANURI
-   0x72 LANG_OROMO
-   0x73 LANG_TIGRINYA
-   0x74 LANG_GUARANI
-   0x75 LANG_HAWAIIAN
-   0x76 LANG_LATIN
-   0x77 LANG_SOMALI
-   0x78 LANG_YI
-   0x79 LANG_PAPIAMENTU
-*/
-/* Mingw headers don't have latest language and sublanguage codes.  */
-# ifndef LANG_AFRIKAANS
-# define LANG_AFRIKAANS 0x36
-# endif
-# ifndef LANG_ALBANIAN
-# define LANG_ALBANIAN 0x1c
-# endif
-# ifndef LANG_AMHARIC
-# define LANG_AMHARIC 0x5e
-# endif
-# ifndef LANG_ARABIC
-# define LANG_ARABIC 0x01
-# endif
-# ifndef LANG_ARMENIAN
-# define LANG_ARMENIAN 0x2b
-# endif
-# ifndef LANG_ASSAMESE
-# define LANG_ASSAMESE 0x4d
-# endif
-# ifndef LANG_AZERI
-# define LANG_AZERI 0x2c
-# endif
-# ifndef LANG_BASQUE
-# define LANG_BASQUE 0x2d
-# endif
-# ifndef LANG_BELARUSIAN
-# define LANG_BELARUSIAN 0x23
-# endif
-# ifndef LANG_BENGALI
-# define LANG_BENGALI 0x45
-# endif
-# ifndef LANG_BURMESE
-# define LANG_BURMESE 0x55
-# endif
-# ifndef LANG_CAMBODIAN
-# define LANG_CAMBODIAN 0x53
-# endif
-# ifndef LANG_CATALAN
-# define LANG_CATALAN 0x03
-# endif
-# ifndef LANG_CHEROKEE
-# define LANG_CHEROKEE 0x5c
-# endif
-# ifndef LANG_DIVEHI
-# define LANG_DIVEHI 0x65
-# endif
-# ifndef LANG_EDO
-# define LANG_EDO 0x66
-# endif
-# ifndef LANG_ESTONIAN
-# define LANG_ESTONIAN 0x25
-# endif
-# ifndef LANG_FAEROESE
-# define LANG_FAEROESE 0x38
-# endif
-# ifndef LANG_FARSI
-# define LANG_FARSI 0x29
-# endif
-# ifndef LANG_FRISIAN
-# define LANG_FRISIAN 0x62
-# endif
-# ifndef LANG_FULFULDE
-# define LANG_FULFULDE 0x67
-# endif
-# ifndef LANG_GAELIC
-# define LANG_GAELIC 0x3c
-# endif
-# ifndef LANG_GALICIAN
-# define LANG_GALICIAN 0x56
-# endif
-# ifndef LANG_GEORGIAN
-# define LANG_GEORGIAN 0x37
-# endif
-# ifndef LANG_GUARANI
-# define LANG_GUARANI 0x74
-# endif
-# ifndef LANG_GUJARATI
-# define LANG_GUJARATI 0x47
-# endif
-# ifndef LANG_HAUSA
-# define LANG_HAUSA 0x68
-# endif
-# ifndef LANG_HAWAIIAN
-# define LANG_HAWAIIAN 0x75
-# endif
-# ifndef LANG_HEBREW
-# define LANG_HEBREW 0x0d
-# endif
-# ifndef LANG_HINDI
-# define LANG_HINDI 0x39
-# endif
-# ifndef LANG_IBIBIO
-# define LANG_IBIBIO 0x69
-# endif
-# ifndef LANG_IGBO
-# define LANG_IGBO 0x70
-# endif
-# ifndef LANG_INDONESIAN
-# define LANG_INDONESIAN 0x21
-# endif
-# ifndef LANG_INUKTITUT
-# define LANG_INUKTITUT 0x5d
-# endif
-# ifndef LANG_KANNADA
-# define LANG_KANNADA 0x4b
-# endif
-# ifndef LANG_KANURI
-# define LANG_KANURI 0x71
-# endif
-# ifndef LANG_KASHMIRI
-# define LANG_KASHMIRI 0x60
-# endif
-# ifndef LANG_KAZAK
-# define LANG_KAZAK 0x3f
-# endif
-# ifndef LANG_KONKANI
-# define LANG_KONKANI 0x57
-# endif
-# ifndef LANG_KYRGYZ
-# define LANG_KYRGYZ 0x40
-# endif
-# ifndef LANG_LAO
-# define LANG_LAO 0x54
-# endif
-# ifndef LANG_LATIN
-# define LANG_LATIN 0x76
-# endif
-# ifndef LANG_LATVIAN
-# define LANG_LATVIAN 0x26
-# endif
-# ifndef LANG_LITHUANIAN
-# define LANG_LITHUANIAN 0x27
-# endif
-# ifndef LANG_MACEDONIAN
-# define LANG_MACEDONIAN 0x2f
-# endif
-# ifndef LANG_MALAY
-# define LANG_MALAY 0x3e
-# endif
-# ifndef LANG_MALAYALAM
-# define LANG_MALAYALAM 0x4c
-# endif
-# ifndef LANG_MALTESE
-# define LANG_MALTESE 0x3a
-# endif
-# ifndef LANG_MANIPURI
-# define LANG_MANIPURI 0x58
-# endif
-# ifndef LANG_MARATHI
-# define LANG_MARATHI 0x4e
-# endif
-# ifndef LANG_MONGOLIAN
-# define LANG_MONGOLIAN 0x50
-# endif
-# ifndef LANG_NEPALI
-# define LANG_NEPALI 0x61
-# endif
-# ifndef LANG_ORIYA
-# define LANG_ORIYA 0x48
-# endif
-# ifndef LANG_OROMO
-# define LANG_OROMO 0x72
-# endif
-# ifndef LANG_PAPIAMENTU
-# define LANG_PAPIAMENTU 0x79
-# endif
-# ifndef LANG_PASHTO
-# define LANG_PASHTO 0x63
-# endif
-# ifndef LANG_PUNJABI
-# define LANG_PUNJABI 0x46
-# endif
-# ifndef LANG_RHAETO_ROMANCE
-# define LANG_RHAETO_ROMANCE 0x17
-# endif
-# ifndef LANG_SAAMI
-# define LANG_SAAMI 0x3b
-# endif
-# ifndef LANG_SANSKRIT
-# define LANG_SANSKRIT 0x4f
-# endif
-# ifndef LANG_SERBIAN
-# define LANG_SERBIAN 0x1a
-# endif
-# ifndef LANG_SINDHI
-# define LANG_SINDHI 0x59
-# endif
-# ifndef LANG_SINHALESE
-# define LANG_SINHALESE 0x5b
-# endif
-# ifndef LANG_SLOVAK
-# define LANG_SLOVAK 0x1b
-# endif
-# ifndef LANG_SOMALI
-# define LANG_SOMALI 0x77
-# endif
-# ifndef LANG_SORBIAN
-# define LANG_SORBIAN 0x2e
-# endif
-# ifndef LANG_SUTU
-# define LANG_SUTU 0x30
-# endif
-# ifndef LANG_SWAHILI
-# define LANG_SWAHILI 0x41
-# endif
-# ifndef LANG_SYRIAC
-# define LANG_SYRIAC 0x5a
-# endif
-# ifndef LANG_TAGALOG
-# define LANG_TAGALOG 0x64
-# endif
-# ifndef LANG_TAJIK
-# define LANG_TAJIK 0x28
-# endif
-# ifndef LANG_TAMAZIGHT
-# define LANG_TAMAZIGHT 0x5f
-# endif
-# ifndef LANG_TAMIL
-# define LANG_TAMIL 0x49
-# endif
-# ifndef LANG_TATAR
-# define LANG_TATAR 0x44
-# endif
-# ifndef LANG_TELUGU
-# define LANG_TELUGU 0x4a
-# endif
-# ifndef LANG_THAI
-# define LANG_THAI 0x1e
-# endif
-# ifndef LANG_TIBETAN
-# define LANG_TIBETAN 0x51
-# endif
-# ifndef LANG_TIGRINYA
-# define LANG_TIGRINYA 0x73
-# endif
-# ifndef LANG_TSONGA
-# define LANG_TSONGA 0x31
-# endif
-# ifndef LANG_TSWANA
-# define LANG_TSWANA 0x32
-# endif
-# ifndef LANG_TURKMEN
-# define LANG_TURKMEN 0x42
-# endif
-# ifndef LANG_UKRAINIAN
-# define LANG_UKRAINIAN 0x22
-# endif
-# ifndef LANG_URDU
-# define LANG_URDU 0x20
-# endif
-# ifndef LANG_UZBEK
-# define LANG_UZBEK 0x43
-# endif
-# ifndef LANG_VENDA
-# define LANG_VENDA 0x33
-# endif
-# ifndef LANG_VIETNAMESE
-# define LANG_VIETNAMESE 0x2a
-# endif
-# ifndef LANG_WELSH
-# define LANG_WELSH 0x52
-# endif
-# ifndef LANG_XHOSA
-# define LANG_XHOSA 0x34
-# endif
-# ifndef LANG_YI
-# define LANG_YI 0x78
-# endif
-# ifndef LANG_YIDDISH
-# define LANG_YIDDISH 0x3d
-# endif
-# ifndef LANG_YORUBA
-# define LANG_YORUBA 0x6a
-# endif
-# ifndef LANG_ZULU
-# define LANG_ZULU 0x35
-# endif
-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_IRAQ
-# define SUBLANG_ARABIC_IRAQ 0x02
-# endif
-# ifndef SUBLANG_ARABIC_EGYPT
-# define SUBLANG_ARABIC_EGYPT 0x03
-# endif
-# ifndef SUBLANG_ARABIC_LIBYA
-# define SUBLANG_ARABIC_LIBYA 0x04
-# endif
-# ifndef SUBLANG_ARABIC_ALGERIA
-# define SUBLANG_ARABIC_ALGERIA 0x05
-# endif
-# ifndef SUBLANG_ARABIC_MOROCCO
-# define SUBLANG_ARABIC_MOROCCO 0x06
-# endif
-# ifndef SUBLANG_ARABIC_TUNISIA
-# define SUBLANG_ARABIC_TUNISIA 0x07
-# endif
-# ifndef SUBLANG_ARABIC_OMAN
-# define SUBLANG_ARABIC_OMAN 0x08
-# endif
-# ifndef SUBLANG_ARABIC_YEMEN
-# define SUBLANG_ARABIC_YEMEN 0x09
-# endif
-# ifndef SUBLANG_ARABIC_SYRIA
-# define SUBLANG_ARABIC_SYRIA 0x0a
-# endif
-# ifndef SUBLANG_ARABIC_JORDAN
-# define SUBLANG_ARABIC_JORDAN 0x0b
-# endif
-# ifndef SUBLANG_ARABIC_LEBANON
-# define SUBLANG_ARABIC_LEBANON 0x0c
-# endif
-# ifndef SUBLANG_ARABIC_KUWAIT
-# define SUBLANG_ARABIC_KUWAIT 0x0d
-# endif
-# ifndef SUBLANG_ARABIC_UAE
-# define SUBLANG_ARABIC_UAE 0x0e
-# endif
-# ifndef SUBLANG_ARABIC_BAHRAIN
-# define SUBLANG_ARABIC_BAHRAIN 0x0f
-# endif
-# ifndef SUBLANG_ARABIC_QATAR
-# define SUBLANG_ARABIC_QATAR 0x10
-# endif
-# ifndef SUBLANG_AZERI_LATIN
-# define SUBLANG_AZERI_LATIN 0x01
-# endif
-# ifndef SUBLANG_AZERI_CYRILLIC
-# define SUBLANG_AZERI_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x00
-# endif
-# ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x01
-# endif
-# ifndef SUBLANG_CHINESE_MACAU
-# define SUBLANG_CHINESE_MACAU 0x05
-# endif
-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
-# endif
-# ifndef SUBLANG_ENGLISH_JAMAICA
-# define SUBLANG_ENGLISH_JAMAICA 0x08
-# endif
-# ifndef SUBLANG_ENGLISH_CARIBBEAN
-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
-# endif
-# ifndef SUBLANG_ENGLISH_BELIZE
-# define SUBLANG_ENGLISH_BELIZE 0x0a
-# endif
-# ifndef SUBLANG_ENGLISH_TRINIDAD
-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
-# endif
-# ifndef SUBLANG_ENGLISH_ZIMBABWE
-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
-# endif
-# ifndef SUBLANG_ENGLISH_PHILIPPINES
-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
-# endif
-# ifndef SUBLANG_ENGLISH_INDONESIA
-# define SUBLANG_ENGLISH_INDONESIA 0x0e
-# endif
-# ifndef SUBLANG_ENGLISH_HONGKONG
-# define SUBLANG_ENGLISH_HONGKONG 0x0f
-# endif
-# ifndef SUBLANG_ENGLISH_INDIA
-# define SUBLANG_ENGLISH_INDIA 0x10
-# endif
-# ifndef SUBLANG_ENGLISH_MALAYSIA
-# define SUBLANG_ENGLISH_MALAYSIA 0x11
-# endif
-# ifndef SUBLANG_ENGLISH_SINGAPORE
-# define SUBLANG_ENGLISH_SINGAPORE 0x12
-# endif
-# ifndef SUBLANG_FRENCH_LUXEMBOURG
-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
-# endif
-# ifndef SUBLANG_FRENCH_MONACO
-# define SUBLANG_FRENCH_MONACO 0x06
-# endif
-# ifndef SUBLANG_FRENCH_WESTINDIES
-# define SUBLANG_FRENCH_WESTINDIES 0x07
-# endif
-# ifndef SUBLANG_FRENCH_REUNION
-# define SUBLANG_FRENCH_REUNION 0x08
-# endif
-# ifndef SUBLANG_FRENCH_CONGO
-# define SUBLANG_FRENCH_CONGO 0x09
-# endif
-# ifndef SUBLANG_FRENCH_SENEGAL
-# define SUBLANG_FRENCH_SENEGAL 0x0a
-# endif
-# ifndef SUBLANG_FRENCH_CAMEROON
-# define SUBLANG_FRENCH_CAMEROON 0x0b
-# endif
-# ifndef SUBLANG_FRENCH_COTEDIVOIRE
-# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
-# endif
-# ifndef SUBLANG_FRENCH_MALI
-# define SUBLANG_FRENCH_MALI 0x0d
-# endif
-# ifndef SUBLANG_FRENCH_MOROCCO
-# define SUBLANG_FRENCH_MOROCCO 0x0e
-# endif
-# ifndef SUBLANG_FRENCH_HAITI
-# define SUBLANG_FRENCH_HAITI 0x0f
-# endif
-# ifndef SUBLANG_GERMAN_LUXEMBOURG
-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
-# endif
-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
-# endif
-# ifndef SUBLANG_KASHMIRI_INDIA
-# define SUBLANG_KASHMIRI_INDIA 0x02
-# endif
-# ifndef SUBLANG_MALAY_MALAYSIA
-# define SUBLANG_MALAY_MALAYSIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
-# endif
-# ifndef SUBLANG_NEPALI_INDIA
-# define SUBLANG_NEPALI_INDIA 0x02
-# endif
-# ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x00
-# endif
-# ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x00
-# endif
-# ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
-# endif
-# ifndef SUBLANG_SERBIAN_LATIN
-# define SUBLANG_SERBIAN_LATIN 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_CYRILLIC
-# define SUBLANG_SERBIAN_CYRILLIC 0x03
-# endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x00
-# endif
-# ifndef SUBLANG_SINDHI_PAKISTAN
-# define SUBLANG_SINDHI_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_SPANISH_GUATEMALA
-# define SUBLANG_SPANISH_GUATEMALA 0x04
-# endif
-# ifndef SUBLANG_SPANISH_COSTA_RICA
-# define SUBLANG_SPANISH_COSTA_RICA 0x05
-# endif
-# ifndef SUBLANG_SPANISH_PANAMA
-# define SUBLANG_SPANISH_PANAMA 0x06
-# endif
-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
-# endif
-# ifndef SUBLANG_SPANISH_VENEZUELA
-# define SUBLANG_SPANISH_VENEZUELA 0x08
-# endif
-# ifndef SUBLANG_SPANISH_COLOMBIA
-# define SUBLANG_SPANISH_COLOMBIA 0x09
-# endif
-# ifndef SUBLANG_SPANISH_PERU
-# define SUBLANG_SPANISH_PERU 0x0a
-# endif
-# ifndef SUBLANG_SPANISH_ARGENTINA
-# define SUBLANG_SPANISH_ARGENTINA 0x0b
-# endif
-# ifndef SUBLANG_SPANISH_ECUADOR
-# define SUBLANG_SPANISH_ECUADOR 0x0c
-# endif
-# ifndef SUBLANG_SPANISH_CHILE
-# define SUBLANG_SPANISH_CHILE 0x0d
-# endif
-# ifndef SUBLANG_SPANISH_URUGUAY
-# define SUBLANG_SPANISH_URUGUAY 0x0e
-# endif
-# ifndef SUBLANG_SPANISH_PARAGUAY
-# define SUBLANG_SPANISH_PARAGUAY 0x0f
-# endif
-# ifndef SUBLANG_SPANISH_BOLIVIA
-# define SUBLANG_SPANISH_BOLIVIA 0x10
-# endif
-# ifndef SUBLANG_SPANISH_EL_SALVADOR
-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
-# endif
-# ifndef SUBLANG_SPANISH_HONDURAS
-# define SUBLANG_SPANISH_HONDURAS 0x12
-# endif
-# ifndef SUBLANG_SPANISH_NICARAGUA
-# define SUBLANG_SPANISH_NICARAGUA 0x13
-# endif
-# ifndef SUBLANG_SPANISH_PUERTO_RICO
-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
-# endif
-# ifndef SUBLANG_SWEDISH_FINLAND
-# define SUBLANG_SWEDISH_FINLAND 0x02
-# endif
-# ifndef SUBLANG_TAMAZIGHT_ARABIC
-# define SUBLANG_TAMAZIGHT_ARABIC 0x01
-# endif
-# ifndef SUBLANG_TAMAZIGHT_LATIN
-# define SUBLANG_TAMAZIGHT_LATIN 0x02
-# endif
-# ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
-# endif
-# ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x01
-# endif
-# ifndef SUBLANG_URDU_PAKISTAN
-# define SUBLANG_URDU_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_URDU_INDIA
-# define SUBLANG_URDU_INDIA 0x02
-# endif
-# ifndef SUBLANG_UZBEK_LATIN
-# define SUBLANG_UZBEK_LATIN 0x01
-# endif
-# ifndef SUBLANG_UZBEK_CYRILLIC
-# define SUBLANG_UZBEK_CYRILLIC 0x02
-# endif
-#endif
-
-# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* MacOS X 10.2 or newer */
-
-/* Canonicalize a MacOS X locale name to a Unix locale name.
-   NAME is a sufficiently large buffer.
-   On input, it contains the MacOS X locale name.
-   On output, it contains the Unix locale name.  */
-void
-_nl_locale_name_canonicalize (char *name)
-{
-  /* This conversion is based on a posting by
-     Deborah GoldSmith <[email protected]> on 2005-03-08,
-     http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
-
-  /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
-     ISO 3166) names.  Prior to MacOS X 10.3, there is no API for doing this.
-     Therefore we do it ourselves, using a table based on the results of the
-     MacOS X 10.3.8 function
-     CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
-  typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
-	  legacy_entry;
-  static const legacy_entry legacy_table[] = {
-    { "Afrikaans",             "af" },
-    { "Albanian",              "sq" },
-    { "Amharic",               "am" },
-    { "Arabic",                "ar" },
-    { "Armenian",              "hy" },
-    { "Assamese",              "as" },
-    { "Aymara",                "ay" },
-    { "Azerbaijani",           "az" },
-    { "Basque",                "eu" },
-    { "Belarusian",            "be" },
-    { "Belorussian",           "be" },
-    { "Bengali",               "bn" },
-    { "Brazilian Portugese",   "pt_BR" },
-    { "Brazilian Portuguese",  "pt_BR" },
-    { "Breton",                "br" },
-    { "Bulgarian",             "bg" },
-    { "Burmese",               "my" },
-    { "Byelorussian",          "be" },
-    { "Catalan",               "ca" },
-    { "Chewa",                 "ny" },
-    { "Chichewa",              "ny" },
-    { "Chinese",               "zh" },
-    { "Chinese, Simplified",   "zh_CN" },
-    { "Chinese, Traditional",  "zh_TW" },
-    { "Chinese, Tradtional",   "zh_TW" },
-    { "Croatian",              "hr" },
-    { "Czech",                 "cs" },
-    { "Danish",                "da" },
-    { "Dutch",                 "nl" },
-    { "Dzongkha",              "dz" },
-    { "English",               "en" },
-    { "Esperanto",             "eo" },
-    { "Estonian",              "et" },
-    { "Faroese",               "fo" },
-    { "Farsi",                 "fa" },
-    { "Finnish",               "fi" },
-    { "Flemish",               "nl_BE" },
-    { "French",                "fr" },
-    { "Galician",              "gl" },
-    { "Gallegan",              "gl" },
-    { "Georgian",              "ka" },
-    { "German",                "de" },
-    { "Greek",                 "el" },
-    { "Greenlandic",           "kl" },
-    { "Guarani",               "gn" },
-    { "Gujarati",              "gu" },
-    { "Hawaiian",              "haw" }, /* Yes, "haw", not "cpe".  */
-    { "Hebrew",                "he" },
-    { "Hindi",                 "hi" },
-    { "Hungarian",             "hu" },
-    { "Icelandic",             "is" },
-    { "Indonesian",            "id" },
-    { "Inuktitut",             "iu" },
-    { "Irish",                 "ga" },
-    { "Italian",               "it" },
-    { "Japanese",              "ja" },
-    { "Javanese",              "jv" },
-    { "Kalaallisut",           "kl" },
-    { "Kannada",               "kn" },
-    { "Kashmiri",              "ks" },
-    { "Kazakh",                "kk" },
-    { "Khmer",                 "km" },
-    { "Kinyarwanda",           "rw" },
-    { "Kirghiz",               "ky" },
-    { "Korean",                "ko" },
-    { "Kurdish",               "ku" },
-    { "Latin",                 "la" },
-    { "Latvian",               "lv" },
-    { "Lithuanian",            "lt" },
-    { "Macedonian",            "mk" },
-    { "Malagasy",              "mg" },
-    { "Malay",                 "ms" },
-    { "Malayalam",             "ml" },
-    { "Maltese",               "mt" },
-    { "Manx",                  "gv" },
-    { "Marathi",               "mr" },
-    { "Moldavian",             "mo" },
-    { "Mongolian",             "mn" },
-    { "Nepali",                "ne" },
-    { "Norwegian",             "nb" }, /* Yes, "nb", not the obsolete "no".  */
-    { "Nyanja",                "ny" },
-    { "Nynorsk",               "nn" },
-    { "Oriya",                 "or" },
-    { "Oromo",                 "om" },
-    { "Panjabi",               "pa" },
-    { "Pashto",                "ps" },
-    { "Persian",               "fa" },
-    { "Polish",                "pl" },
-    { "Portuguese",            "pt" },
-    { "Portuguese, Brazilian", "pt_BR" },
-    { "Punjabi",               "pa" },
-    { "Pushto",                "ps" },
-    { "Quechua",               "qu" },
-    { "Romanian",              "ro" },
-    { "Ruanda",                "rw" },
-    { "Rundi",                 "rn" },
-    { "Russian",               "ru" },
-    { "Sami",                  "se_NO" }, /* Not just "se".  */
-    { "Sanskrit",              "sa" },
-    { "Scottish",              "gd" },
-    { "Serbian",               "sr" },
-    { "Simplified Chinese",    "zh_CN" },
-    { "Sindhi",                "sd" },
-    { "Sinhalese",             "si" },
-    { "Slovak",                "sk" },
-    { "Slovenian",             "sl" },
-    { "Somali",                "so" },
-    { "Spanish",               "es" },
-    { "Sundanese",             "su" },
-    { "Swahili",               "sw" },
-    { "Swedish",               "sv" },
-    { "Tagalog",               "tl" },
-    { "Tajik",                 "tg" },
-    { "Tajiki",                "tg" },
-    { "Tamil",                 "ta" },
-    { "Tatar",                 "tt" },
-    { "Telugu",                "te" },
-    { "Thai",                  "th" },
-    { "Tibetan",               "bo" },
-    { "Tigrinya",              "ti" },
-    { "Tongan",                "to" },
-    { "Traditional Chinese",   "zh_TW" },
-    { "Turkish",               "tr" },
-    { "Turkmen",               "tk" },
-    { "Uighur",                "ug" },
-    { "Ukrainian",             "uk" },
-    { "Urdu",                  "ur" },
-    { "Uzbek",                 "uz" },
-    { "Vietnamese",            "vi" },
-    { "Welsh",                 "cy" },
-    { "Yiddish",               "yi" }
-  };
-
-  /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
-     to Unix (ISO 639 and ISO 3166) names.  */
-  typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
-	  langtag_entry;
-  static const langtag_entry langtag_table[] = {
-    /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
-       The default script for az on Unix is Latin.  */
-    { "az-Latn", "az" },
-    /* MacOS X has "ga-dots".  Does not yet exist on Unix.  */
-    { "ga-dots", "ga" },
-    /* MacOS X has "kk-Cyrl".  Does not yet exist on Unix.  */
-    /* MacOS X has "mn-Cyrl", "mn-Mong".
-       The default script for mn on Unix is Cyrillic.  */
-    { "mn-Cyrl", "mn" },
-    /* MacOS X has "ms-Arab", "ms-Latn".
-       The default script for ms on Unix is Latin.  */
-    { "ms-Latn", "ms" },
-    /* MacOS X has "tg-Cyrl".
-       The default script for tg on Unix is Cyrillic.  */
-    { "tg-Cyrl", "tg" },
-    /* MacOS X has "tk-Cyrl".  Does not yet exist on Unix.  */
-    /* MacOS X has "tt-Cyrl".
-       The default script for tt on Unix is Cyrillic.  */
-    { "tt-Cyrl", "tt" },
-    /* MacOS X has "zh-Hans", "zh-Hant".
-       Country codes are used to distinguish these on Unix.  */
-    { "zh-Hans", "zh_CN" },
-    { "zh-Hant", "zh_TW" }
-  };
-
-  /* Convert script names (ISO 15924) to Unix conventions.
-     See http://www.unicode.org/iso15924/iso15924-codes.html  */
-  typedef struct { const char script[4+1]; const char unixy[9+1]; }
-	  script_entry;
-  static const script_entry script_table[] = {
-    { "Arab", "arabic" },
-    { "Cyrl", "cyrillic" },
-    { "Mong", "mongolian" }
-  };
-
-  /* Step 1: Convert using legacy_table.  */
-  if (name[0] >= 'A' && name[0] <= 'Z')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (legacy_table) / sizeof (legacy_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if name occurs in legacy_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const legacy_entry *p = &legacy_table[i];
-	  if (strcmp (name, p->legacy) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name, legacy_table[i1].legacy) == 0)
-	{
-	  strcpy (name, legacy_table[i1].unixy);
-	  return;
-	}
-    }
-
-  /* Step 2: Convert using langtag_table and script_table.  */
-  if (strlen (name) == 7 && name[2] == '-')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (langtag_table) / sizeof (langtag_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if name occurs in langtag_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const langtag_entry *p = &langtag_table[i];
-	  if (strcmp (name, p->langtag) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name, langtag_table[i1].langtag) == 0)
-	{
-	  strcpy (name, langtag_table[i1].unixy);
-	  return;
-	}
-
-      i1 = 0;
-      i2 = sizeof (script_table) / sizeof (script_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if (name + 3) occurs in script_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const script_entry *p = &script_table[i];
-	  if (strcmp (name + 3, p->script) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name + 3, script_table[i1].script) == 0)
-	{
-	  name[2] = '@';
-	  strcpy (name + 3, script_table[i1].unixy);
-	  return;
-	}
-    }
-
-  /* Step 3: Convert new-style dash to Unix underscore. */
-  {
-    char *p;
-    for (p = name; *p != '\0'; p++)
-      if (*p == '-')
-	*p = '_';
-  }
-}
-
-#endif
-
-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
-   "Directs 'setlocale()' to query 'category' and return the current
-    setting of 'local'."
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Determine the current locale's name, and canonicalize it into XPG syntax
-     language[_territory][.codeset][@modifier]
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-
-const char *
-_nl_locale_name_posix (int category, const char *categoryname)
-{
-  /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
-     On some systems this can be done by the 'setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  const char *retval;
-
-  /* Setting of LC_ALL overrides all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  return NULL;
-#endif
-}
-
-const char *
-_nl_locale_name_default (void)
-{
-  /* POSIX:2001 says:
-     "All implementations shall define a locale as the default locale, to be
-      invoked when no environment variables are set, or set to the empty
-      string.  This default locale can be the POSIX locale or any other
-      implementation-defined locale.  Some implementations may provide
-      facilities for local installation administrators to set the default
-      locale, customizing it for each location.  POSIX:2001 does not require
-      such a facility.  */
-
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined(WIN32_NATIVE))
-
-  /* The system does not have a way of setting the locale, other than the
-     POSIX specified environment variables.  We use C as default locale.  */
-  return "C";
-
-#else
-
-  /* Return an XPG style locale name language[_territory][@modifier].
-     Don't even bother determining the codeset; it's not useful in this
-     context, because message catalogs are not specific to a single
-     codeset.  */
-
-# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-  /* MacOS X 10.2 or newer */
-  {
-    /* Cache the locale name, since CoreFoundation calls are expensive.  */
-    static const char *cached_localename;
-
-    if (cached_localename == NULL)
-      {
-	char namebuf[256];
-#  if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
-	CFLocaleRef locale = CFLocaleCopyCurrent ();
-	CFStringRef name = CFLocaleGetIdentifier (locale);
-
-	if (CFStringGetCString (name, namebuf, sizeof(namebuf),
-				kCFStringEncodingASCII))
-	  {
-	    _nl_locale_name_canonicalize (namebuf);
-	    cached_localename = strdup (namebuf);
-	  }
-	CFRelease (locale);
-#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
-	CFTypeRef value =
-	  CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
-				     kCFPreferencesCurrentApplication);
-	if (value != NULL
-	    && CFGetTypeID (value) == CFStringGetTypeID ()
-	    && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf),
-				   kCFStringEncodingASCII))
-	  {
-	    _nl_locale_name_canonicalize (namebuf);
-	    cached_localename = strdup (namebuf);
-	  }
-#  endif
-	if (cached_localename == NULL)
-	  cached_localename = "C";
-      }
-    return cached_localename;
-  }
-
-# endif
-
-# if defined(WIN32_NATIVE) /* WIN32, not Cygwin */
-  {
-    LCID lcid;
-    LANGID langid;
-    int primary, sub;
-
-    /* Use native Win32 API locale ID.  */
-    lcid = GetThreadLocale ();
-
-    /* Strip off the sorting rules, keep only the language part.  */
-    langid = LANGIDFROMLCID (lcid);
-
-    /* Split into language and territory part.  */
-    primary = PRIMARYLANGID (langid);
-    sub = SUBLANGID (langid);
-
-    /* Dispatch on language.
-       See also http://www.unicode.org/unicode/onlinedat/languages.html .
-       For details about languages, see http://www.ethnologue.com/ .  */
-    switch (primary)
-      {
-      case LANG_AFRIKAANS: return "af_ZA";
-      case LANG_ALBANIAN: return "sq_AL";
-      case LANG_AMHARIC: return "am_ET";
-      case LANG_ARABIC:
-	switch (sub)
-	  {
-	  case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
-	  case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
-	  case SUBLANG_ARABIC_EGYPT: return "ar_EG";
-	  case SUBLANG_ARABIC_LIBYA: return "ar_LY";
-	  case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
-	  case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
-	  case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
-	  case SUBLANG_ARABIC_OMAN: return "ar_OM";
-	  case SUBLANG_ARABIC_YEMEN: return "ar_YE";
-	  case SUBLANG_ARABIC_SYRIA: return "ar_SY";
-	  case SUBLANG_ARABIC_JORDAN: return "ar_JO";
-	  case SUBLANG_ARABIC_LEBANON: return "ar_LB";
-	  case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
-	  case SUBLANG_ARABIC_UAE: return "ar_AE";
-	  case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
-	  case SUBLANG_ARABIC_QATAR: return "ar_QA";
-	  }
-	return "ar";
-      case LANG_ARMENIAN: return "hy_AM";
-      case LANG_ASSAMESE: return "as_IN";
-      case LANG_AZERI:
-	switch (sub)
-	  {
-	  /* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
-	  case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
-	  case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
-	  }
-	return "az";
-      case LANG_BASQUE:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "eu_ES";
-	  }
-	return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
-      case LANG_BELARUSIAN: return "be_BY";
-      case LANG_BENGALI:
-	switch (sub)
-	  {
-	  case SUBLANG_BENGALI_INDIA: return "bn_IN";
-	  case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
-	  }
-	return "bn";
-      case LANG_BULGARIAN: return "bg_BG";
-      case LANG_BURMESE: return "my_MM";
-      case LANG_CAMBODIAN: return "km_KH";
-      case LANG_CATALAN: return "ca_ES";
-      case LANG_CHEROKEE: return "chr_US";
-      case LANG_CHINESE:
-	switch (sub)
-	  {
-	  case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
-	  case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
-	  case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
-	  case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
-	  case SUBLANG_CHINESE_MACAU: return "zh_MO";
-	  }
-	return "zh";
-      case LANG_CROATIAN:       /* LANG_CROATIAN == LANG_SERBIAN
-				 * What used to be called Serbo-Croatian
-				 * should really now be two separate
-				 * languages because of political reasons.
-				 * (Says tml, who knows nothing about Serbian
-				 * or Croatian.)
-				 * (I can feel those flames coming already.)
-				 */
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "hr_HR";
-	  case SUBLANG_SERBIAN_LATIN: return "sr_CS";
-	  case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
-	  }
-	return "hr";
-      case LANG_CZECH: return "cs_CZ";
-      case LANG_DANISH: return "da_DK";
-      case LANG_DIVEHI: return "dv_MV";
-      case LANG_DUTCH:
-	switch (sub)
-	  {
-	  case SUBLANG_DUTCH: return "nl_NL";
-	  case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
-	  }
-	return "nl";
-      case LANG_EDO: return "bin_NG";
-      case LANG_ENGLISH:
-	switch (sub)
-	  {
-	  /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
-	   * English was the language spoken in England.
-	   * Oh well.
-	   */
-	  case SUBLANG_ENGLISH_US: return "en_US";
-	  case SUBLANG_ENGLISH_UK: return "en_GB";
-	  case SUBLANG_ENGLISH_AUS: return "en_AU";
-	  case SUBLANG_ENGLISH_CAN: return "en_CA";
-	  case SUBLANG_ENGLISH_NZ: return "en_NZ";
-	  case SUBLANG_ENGLISH_EIRE: return "en_IE";
-	  case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
-	  case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
-	  case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
-	  case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
-	  case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
-	  case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
-	  case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
-	  case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
-	  case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
-	  case SUBLANG_ENGLISH_INDIA: return "en_IN";
-	  case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
-	  case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
-	  }
-	return "en";
-      case LANG_ESTONIAN: return "et_EE";
-      case LANG_FAEROESE: return "fo_FO";
-      case LANG_FARSI: return "fa_IR";
-      case LANG_FINNISH: return "fi_FI";
-      case LANG_FRENCH:
-	switch (sub)
-	  {
-	  case SUBLANG_FRENCH: return "fr_FR";
-	  case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
-	  case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
-	  case SUBLANG_FRENCH_SWISS: return "fr_CH";
-	  case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
-	  case SUBLANG_FRENCH_MONACO: return "fr_MC";
-	  case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
-	  case SUBLANG_FRENCH_REUNION: return "fr_RE";
-	  case SUBLANG_FRENCH_CONGO: return "fr_CG";
-	  case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
-	  case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
-	  case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
-	  case SUBLANG_FRENCH_MALI: return "fr_ML";
-	  case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
-	  case SUBLANG_FRENCH_HAITI: return "fr_HT";
-	  }
-	return "fr";
-      case LANG_FRISIAN: return "fy_NL";
-      case LANG_FULFULDE:
-	/* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin.  */
-	return "ff_NG";
-      case LANG_GAELIC:
-	switch (sub)
-	  {
-	  case 0x01: /* SCOTTISH */ return "gd_GB";
-	  case 0x02: /* IRISH */ return "ga_IE";
-	  }
-	return "C";
-      case LANG_GALICIAN: return "gl_ES";
-      case LANG_GEORGIAN: return "ka_GE";
-      case LANG_GERMAN:
-	switch (sub)
-	  {
-	  case SUBLANG_GERMAN: return "de_DE";
-	  case SUBLANG_GERMAN_SWISS: return "de_CH";
-	  case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
-	  case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
-	  case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
-	  }
-	return "de";
-      case LANG_GREEK: return "el_GR";
-      case LANG_GUARANI: return "gn_PY";
-      case LANG_GUJARATI: return "gu_IN";
-      case LANG_HAUSA: return "ha_NG";
-      case LANG_HAWAIIAN:
-	/* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
-	   or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
-	return "cpe_US";
-      case LANG_HEBREW: return "he_IL";
-      case LANG_HINDI: return "hi_IN";
-      case LANG_HUNGARIAN: return "hu_HU";
-      case LANG_IBIBIO: return "nic_NG";
-      case LANG_ICELANDIC: return "is_IS";
-      case LANG_IGBO: return "ig_NG";
-      case LANG_INDONESIAN: return "id_ID";
-      case LANG_INUKTITUT: return "iu_CA";
-      case LANG_ITALIAN:
-	switch (sub)
-	  {
-	  case SUBLANG_ITALIAN: return "it_IT";
-	  case SUBLANG_ITALIAN_SWISS: return "it_CH";
-	  }
-	return "it";
-      case LANG_JAPANESE: return "ja_JP";
-      case LANG_KANNADA: return "kn_IN";
-      case LANG_KANURI: return "kr_NG";
-      case LANG_KASHMIRI:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "ks_PK";
-	  case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
-	  }
-	return "ks";
-      case LANG_KAZAK: return "kk_KZ";
-      case LANG_KONKANI:
-	/* FIXME: Adjust this when such locales appear on Unix.  */
-	return "kok_IN";
-      case LANG_KOREAN: return "ko_KR";
-      case LANG_KYRGYZ: return "ky_KG";
-      case LANG_LAO: return "lo_LA";
-      case LANG_LATIN: return "la_VA";
-      case LANG_LATVIAN: return "lv_LV";
-      case LANG_LITHUANIAN: return "lt_LT";
-      case LANG_MACEDONIAN: return "mk_MK";
-      case LANG_MALAY:
-	switch (sub)
-	  {
-	  case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
-	  case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
-	  }
-	return "ms";
-      case LANG_MALAYALAM: return "ml_IN";
-      case LANG_MALTESE: return "mt_MT";
-      case LANG_MANIPURI:
-	/* FIXME: Adjust this when such locales appear on Unix.  */
-	return "mni_IN";
-      case LANG_MARATHI: return "mr_IN";
-      case LANG_MONGOLIAN:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "mn_MN";
-	  }
-	return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
-      case LANG_NEPALI:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "ne_NP";
-	  case SUBLANG_NEPALI_INDIA: return "ne_IN";
-	  }
-	return "ne";
-      case LANG_NORWEGIAN:
-	switch (sub)
-	  {
-	  case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
-	  case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
-	  }
-	return "no";
-      case LANG_ORIYA: return "or_IN";
-      case LANG_OROMO: return "om_ET";
-      case LANG_PAPIAMENTU: return "pap_AN";
-      case LANG_PASHTO:
-	return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
-      case LANG_POLISH: return "pl_PL";
-      case LANG_PORTUGUESE:
-	switch (sub)
-	  {
-	  case SUBLANG_PORTUGUESE: return "pt_PT";
-	  /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
-	     Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
-	  case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
-	  }
-	return "pt";
-      case LANG_PUNJABI:
-	switch (sub)
-	  {
-	  case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-	  case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
-	  }
-	return "pa";
-      case LANG_RHAETO_ROMANCE: return "rm_CH";
-      case LANG_ROMANIAN:
-	switch (sub)
-	  {
-	  case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-	  case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
-	  }
-	return "ro";
-      case LANG_RUSSIAN:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "ru_RU";
-	  }
-	return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
-      case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
-      case LANG_SANSKRIT: return "sa_IN";
-      case LANG_SINDHI:
-	switch (sub)
-	  {
-	  case SUBLANG_SINDHI_INDIA: return "sd_IN";
-	  case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-	  }
-	return "sd";
-      case LANG_SINHALESE: return "si_LK";
-      case LANG_SLOVAK: return "sk_SK";
-      case LANG_SLOVENIAN: return "sl_SI";
-      case LANG_SOMALI: return "so_SO";
-      case LANG_SORBIAN:
-	/* FIXME: Adjust this when such locales appear on Unix.  */
-	return "wen_DE";
-      case LANG_SPANISH:
-	switch (sub)
-	  {
-	  case SUBLANG_SPANISH: return "es_ES";
-	  case SUBLANG_SPANISH_MEXICAN: return "es_MX";
-	  case SUBLANG_SPANISH_MODERN:
-	    return "es_ES@modern";	/* not seen on Unix */
-	  case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
-	  case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
-	  case SUBLANG_SPANISH_PANAMA: return "es_PA";
-	  case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
-	  case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
-	  case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
-	  case SUBLANG_SPANISH_PERU: return "es_PE";
-	  case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
-	  case SUBLANG_SPANISH_ECUADOR: return "es_EC";
-	  case SUBLANG_SPANISH_CHILE: return "es_CL";
-	  case SUBLANG_SPANISH_URUGUAY: return "es_UY";
-	  case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
-	  case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
-	  case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
-	  case SUBLANG_SPANISH_HONDURAS: return "es_HN";
-	  case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
-	  case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
-	  }
-	return "es";
-      case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
-      case LANG_SWAHILI: return "sw_KE";
-      case LANG_SWEDISH:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "sv_SE";
-	  case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
-	  }
-	return "sv";
-      case LANG_SYRIAC: return "syr_TR"; /* An extinct language.  */
-      case LANG_TAGALOG: return "tl_PH";
-      case LANG_TAJIK: return "tg_TJ";
-      case LANG_TAMAZIGHT:
-	switch (sub)
-	  {
-	  /* FIXME: Adjust this when Tamazight locales appear on Unix.  */
-	  case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
-	  case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
-	  }
-	return "ber_MA";
-      case LANG_TAMIL:
-	switch (sub)
-	  {
-	  case SUBLANG_DEFAULT: return "ta_IN";
-	  }
-	return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-      case LANG_TATAR: return "tt_RU";
-      case LANG_TELUGU: return "te_IN";
-      case LANG_THAI: return "th_TH";
-      case LANG_TIBETAN: return "bo_CN";
-      case LANG_TIGRINYA:
-	switch (sub)
-	  {
-	  case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
-	  case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
-	  }
-	return "ti";
-      case LANG_TSONGA: return "ts_ZA";
-      case LANG_TSWANA: return "tn_BW";
-      case LANG_TURKISH: return "tr_TR";
-      case LANG_TURKMEN: return "tk_TM";
-      case LANG_UKRAINIAN: return "uk_UA";
-      case LANG_URDU:
-	switch (sub)
-	  {
-	  case SUBLANG_URDU_PAKISTAN: return "ur_PK";
-	  case SUBLANG_URDU_INDIA: return "ur_IN";
-	  }
-	return "ur";
-      case LANG_UZBEK:
-	switch (sub)
-	  {
-	  case SUBLANG_UZBEK_LATIN: return "uz_UZ";
-	  case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
-	  }
-	return "uz";
-      case LANG_VENDA: return "ve_ZA";
-      case LANG_VIETNAMESE: return "vi_VN";
-      case LANG_WELSH: return "cy_GB";
-      case LANG_XHOSA: return "xh_ZA";
-      case LANG_YI: return "sit_CN";
-      case LANG_YIDDISH: return "yi_IL";
-      case LANG_YORUBA: return "yo_NG";
-      case LANG_ZULU: return "zu_ZA";
-      default: return "C";
-      }
-  }
-# endif
-#endif
-}
-
-const char *
-_nl_locale_name (int category, const char *categoryname)
-{
-  const char *retval;
-
-  retval = _nl_locale_name_posix (category, categoryname);
-  if (retval != NULL)
-    return retval;
-
-  return _nl_locale_name_default ();
-}
diff --git a/intl/lock.c b/intl/lock.c
deleted file mode 100644
index f60a8d9be..000000000
--- a/intl/lock.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <[email protected]>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-#include <config.h>
-
-#include "lock.h"
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
-{
-  return arg;
-}
-
-int
-glthread_in_use (void)
-{
-  static int tested;
-  static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-  if (!tested)
-    {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-	/* Thread creation failed.  */
-	result = 0;
-      else
-	{
-	  /* Thread creation works.  */
-	  void *retval;
-	  if (pthread_join (thread, &retval) != 0)
-	    abort ();
-	  result = 1;
-	}
-      tested = 1;
-    }
-  return result;
-}
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  if !defined PTHREAD_RWLOCK_INITIALIZER
-
-void
-glthread_rwlock_init (gl_rwlock_t *lock)
-{
-  if (pthread_rwlock_init (&lock->rwlock, NULL) != 0)
-    abort ();
-  lock->initialized = 1;
-}
-
-void
-glthread_rwlock_rdlock (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      if (pthread_mutex_lock (&lock->guard) != 0)
-	abort ();
-      if (!lock->initialized)
-	glthread_rwlock_init (lock);
-      if (pthread_mutex_unlock (&lock->guard) != 0)
-	abort ();
-    }
-  if (pthread_rwlock_rdlock (&lock->rwlock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_wrlock (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      if (pthread_mutex_lock (&lock->guard) != 0)
-	abort ();
-      if (!lock->initialized)
-	glthread_rwlock_init (lock);
-      if (pthread_mutex_unlock (&lock->guard) != 0)
-	abort ();
-    }
-  if (pthread_rwlock_wrlock (&lock->rwlock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_unlock (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    abort ();
-  if (pthread_rwlock_unlock (&lock->rwlock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_destroy (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    abort ();
-  if (pthread_rwlock_destroy (&lock->rwlock) != 0)
-    abort ();
-  lock->initialized = 0;
-}
-
-#  endif
-
-# else
-
-void
-glthread_rwlock_init (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_init (&lock->lock, NULL) != 0)
-    abort ();
-  if (pthread_cond_init (&lock->waiting_readers, NULL) != 0)
-    abort ();
-  if (pthread_cond_init (&lock->waiting_writers, NULL) != 0)
-    abort ();
-  lock->waiting_writers_count = 0;
-  lock->runcount = 0;
-}
-
-void
-glthread_rwlock_rdlock (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_lock (&lock->lock) != 0)
-    abort ();
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  /* POSIX says: "It is implementation-defined whether the calling thread
-     acquires the lock when a writer does not hold the lock and there are
-     writers blocked on the lock."  Let's say, no: give the writers a higher
-     priority.  */
-  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-	 waiting_readers.  */
-      if (pthread_cond_wait (&lock->waiting_readers, &lock->lock) != 0)
-	abort ();
-    }
-  lock->runcount++;
-  if (pthread_mutex_unlock (&lock->lock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_wrlock (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_lock (&lock->lock) != 0)
-    abort ();
-  /* Test whether no readers or writers are currently running.  */
-  while (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-	 waiting_writers.  */
-      lock->waiting_writers_count++;
-      if (pthread_cond_wait (&lock->waiting_writers, &lock->lock) != 0)
-	abort ();
-      lock->waiting_writers_count--;
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  if (pthread_mutex_unlock (&lock->lock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_unlock (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_lock (&lock->lock) != 0)
-    abort ();
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-	abort ();
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-	abort ();
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-	 locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers_count > 0)
-	{
-	  /* Wake up one of the waiting writers.  */
-	  if (pthread_cond_signal (&lock->waiting_writers) != 0)
-	    abort ();
-	}
-      else
-	{
-	  /* Wake up all waiting readers.  */
-	  if (pthread_cond_broadcast (&lock->waiting_readers) != 0)
-	    abort ();
-	}
-    }
-  if (pthread_mutex_unlock (&lock->lock) != 0)
-    abort ();
-}
-
-void
-glthread_rwlock_destroy (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_destroy (&lock->lock) != 0)
-    abort ();
-  if (pthread_cond_destroy (&lock->waiting_readers) != 0)
-    abort ();
-  if (pthread_cond_destroy (&lock->waiting_writers) != 0)
-    abort ();
-}
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if !(defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-
-void
-glthread_recursive_lock_init (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-
-  if (pthread_mutexattr_init (&attributes) != 0)
-    abort ();
-  if (pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE) != 0)
-    abort ();
-  if (pthread_mutex_init (&lock->recmutex, &attributes) != 0)
-    abort ();
-  if (pthread_mutexattr_destroy (&attributes) != 0)
-    abort ();
-  lock->initialized = 1;
-}
-
-void
-glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      if (pthread_mutex_lock (&lock->guard) != 0)
-	abort ();
-      if (!lock->initialized)
-	glthread_recursive_lock_init (lock);
-      if (pthread_mutex_unlock (&lock->guard) != 0)
-	abort ();
-    }
-  if (pthread_mutex_lock (&lock->recmutex) != 0)
-    abort ();
-}
-
-void
-glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    abort ();
-  if (pthread_mutex_unlock (&lock->recmutex) != 0)
-    abort ();
-}
-
-void
-glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    abort ();
-  if (pthread_mutex_destroy (&lock->recmutex) != 0)
-    abort ();
-  lock->initialized = 0;
-}
-
-#  endif
-
-# else
-
-void
-glthread_recursive_lock_init (gl_recursive_lock_t *lock)
-{
-  if (pthread_mutex_init (&lock->mutex, NULL) != 0)
-    abort ();
-  lock->owner = (pthread_t) 0;
-  lock->depth = 0;
-}
-
-void
-glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
-{
-  pthread_t self = pthread_self ();
-  if (lock->owner != self)
-    {
-      if (pthread_mutex_lock (&lock->mutex) != 0)
-	abort ();
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    abort ();
-}
-
-void
-glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != pthread_self ())
-    abort ();
-  if (lock->depth == 0)
-    abort ();
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (pthread_t) 0;
-      if (pthread_mutex_unlock (&lock->mutex) != 0)
-	abort ();
-    }
-}
-
-void
-glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (pthread_t) 0)
-    abort ();
-  if (pthread_mutex_destroy (&lock->mutex) != 0)
-    abort ();
-}
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
-
-int
-glthread_once_singlethreaded (pthread_once_t *once_control)
-{
-  /* We don't know whether pthread_once_t is an integer type, a floating-point
-     type, a pointer type, or a structure type.  */
-  char *firstbyte = (char *)once_control;
-  if (*firstbyte == *(const char *)&fresh_once)
-    {
-      /* First time use of once_control.  Invert the first byte.  */
-      *firstbyte = ~ *(const char *)&fresh_once;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once_call (void *arg)
-{
-  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
-  void (*initfunction) (void) = *gl_once_temp_addr;
-  initfunction ();
-}
-
-int
-glthread_once_singlethreaded (pth_once_t *once_control)
-{
-  /* We know that pth_once_t is an integer type.  */
-  if (*once_control == PTH_ONCE_INIT)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      *once_control = ~ PTH_ONCE_INIT;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init (gl_recursive_lock_t *lock)
-{
-  if (mutex_init (&lock->mutex, USYNC_THREAD, NULL) != 0)
-    abort ();
-  lock->owner = (thread_t) 0;
-  lock->depth = 0;
-}
-
-void
-glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
-{
-  thread_t self = thr_self ();
-  if (lock->owner != self)
-    {
-      if (mutex_lock (&lock->mutex) != 0)
-	abort ();
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    abort ();
-}
-
-void
-glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != thr_self ())
-    abort ();
-  if (lock->depth == 0)
-    abort ();
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (thread_t) 0;
-      if (mutex_unlock (&lock->mutex) != 0)
-	abort ();
-    }
-}
-
-void
-glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (thread_t) 0)
-    abort ();
-  if (mutex_destroy (&lock->mutex) != 0)
-    abort ();
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (!once_control->inited)
-    {
-      /* Use the mutex to guarantee that if another thread is already calling
-	 the initfunction, this thread waits until it's finished.  */
-      if (mutex_lock (&once_control->mutex) != 0)
-	abort ();
-      if (!once_control->inited)
-	{
-	  once_control->inited = 1;
-	  initfunction ();
-	}
-      if (mutex_unlock (&once_control->mutex) != 0)
-	abort ();
-    }
-}
-
-int
-glthread_once_singlethreaded (gl_once_t *once_control)
-{
-  /* We know that gl_once_t contains an integer type.  */
-  if (!once_control->inited)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      once_control->inited = ~ 0;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WIN32_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-void
-glthread_lock_init (gl_lock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-void
-glthread_lock_lock (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-	/* This thread is the first one to need this lock.  Initialize it.  */
-	glthread_lock_init (lock);
-      else
-	/* Yield the CPU while waiting for another thread to finish
-	   initializing this lock.  */
-	while (!lock->guard.done)
-	  Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-}
-
-void
-glthread_lock_unlock (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    abort ();
-  LeaveCriticalSection (&lock->lock);
-}
-
-void
-glthread_lock_destroy (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    abort ();
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-}
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-static inline void
-gl_waitqueue_init (gl_waitqueue_t *wq)
-{
-  wq->array = NULL;
-  wq->count = 0;
-  wq->alloc = 0;
-  wq->offset = 0;
-}
-
-/* Enqueues the current thread, represented by an event, in a wait queue.
-   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
-static HANDLE
-gl_waitqueue_add (gl_waitqueue_t *wq)
-{
-  HANDLE event;
-  unsigned int index;
-
-  if (wq->count == wq->alloc)
-    {
-      unsigned int new_alloc = 2 * wq->alloc + 1;
-      HANDLE *new_array =
-	(HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
-      if (new_array == NULL)
-	/* No more memory.  */
-	return INVALID_HANDLE_VALUE;
-      /* Now is a good opportunity to rotate the array so that its contents
-	 starts at offset 0.  */
-      if (wq->offset > 0)
-	{
-	  unsigned int old_count = wq->count;
-	  unsigned int old_alloc = wq->alloc;
-	  unsigned int old_offset = wq->offset;
-	  unsigned int i;
-	  if (old_offset + old_count > old_alloc)
-	    {
-	      unsigned int limit = old_offset + old_count - old_alloc;
-	      for (i = 0; i < limit; i++)
-		new_array[old_alloc + i] = new_array[i];
-	    }
-	  for (i = 0; i < old_count; i++)
-	    new_array[i] = new_array[old_offset + i];
-	  wq->offset = 0;
-	}
-      wq->array = new_array;
-      wq->alloc = new_alloc;
-    }
-  event = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (event == INVALID_HANDLE_VALUE)
-    /* No way to allocate an event.  */
-    return INVALID_HANDLE_VALUE;
-  index = wq->offset + wq->count;
-  if (index >= wq->alloc)
-    index -= wq->alloc;
-  wq->array[index] = event;
-  wq->count++;
-  return event;
-}
-
-/* Notifies the first thread from a wait queue and dequeues it.  */
-static inline void
-gl_waitqueue_notify_first (gl_waitqueue_t *wq)
-{
-  SetEvent (wq->array[wq->offset + 0]);
-  wq->offset++;
-  wq->count--;
-  if (wq->count == 0 || wq->offset == wq->alloc)
-    wq->offset = 0;
-}
-
-/* Notifies all threads from a wait queue and dequeues them all.  */
-static inline void
-gl_waitqueue_notify_all (gl_waitqueue_t *wq)
-{
-  unsigned int i;
-
-  for (i = 0; i < wq->count; i++)
-    {
-      unsigned int index = wq->offset + i;
-      if (index >= wq->alloc)
-	index -= wq->alloc;
-      SetEvent (wq->array[index]);
-    }
-  wq->count = 0;
-  wq->offset = 0;
-}
-
-void
-glthread_rwlock_init (gl_rwlock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  gl_waitqueue_init (&lock->waiting_readers);
-  gl_waitqueue_init (&lock->waiting_writers);
-  lock->runcount = 0;
-  lock->guard.done = 1;
-}
-
-void
-glthread_rwlock_rdlock (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-	/* This thread is the first one to need this lock.  Initialize it.  */
-	glthread_rwlock_init (lock);
-      else
-	/* Yield the CPU while waiting for another thread to finish
-	   initializing this lock.  */
-	while (!lock->guard.done)
-	  Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  if (!(lock->runcount + 1 > 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-	 waiting_readers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
-      if (event != INVALID_HANDLE_VALUE)
-	{
-	  DWORD result;
-	  LeaveCriticalSection (&lock->lock);
-	  /* Wait until another thread signals this event.  */
-	  result = WaitForSingleObject (event, INFINITE);
-	  if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-	    abort ();
-	  CloseHandle (event);
-	  /* The thread which signalled the event already did the bookkeeping:
-	     removed us from the waiting_readers, incremented lock->runcount.  */
-	  if (!(lock->runcount > 0))
-	    abort ();
-	  return;
-	}
-      else
-	{
-	  /* Allocation failure.  Weird.  */
-	  do
-	    {
-	      LeaveCriticalSection (&lock->lock);
-	      Sleep (1);
-	      EnterCriticalSection (&lock->lock);
-	    }
-	  while (!(lock->runcount + 1 > 0));
-	}
-    }
-  lock->runcount++;
-  LeaveCriticalSection (&lock->lock);
-}
-
-void
-glthread_rwlock_wrlock (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-	/* This thread is the first one to need this lock.  Initialize it.  */
-	glthread_rwlock_init (lock);
-      else
-	/* Yield the CPU while waiting for another thread to finish
-	   initializing this lock.  */
-	while (!lock->guard.done)
-	  Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether no readers or writers are currently running.  */
-  if (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-	 waiting_writers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
-      if (event != INVALID_HANDLE_VALUE)
-	{
-	  DWORD result;
-	  LeaveCriticalSection (&lock->lock);
-	  /* Wait until another thread signals this event.  */
-	  result = WaitForSingleObject (event, INFINITE);
-	  if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-	    abort ();
-	  CloseHandle (event);
-	  /* The thread which signalled the event already did the bookkeeping:
-	     removed us from the waiting_writers, set lock->runcount = -1.  */
-	  if (!(lock->runcount == -1))
-	    abort ();
-	  return;
-	}
-      else
-	{
-	  /* Allocation failure.  Weird.  */
-	  do
-	    {
-	      LeaveCriticalSection (&lock->lock);
-	      Sleep (1);
-	      EnterCriticalSection (&lock->lock);
-	    }
-	  while (!(lock->runcount == 0));
-	}
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  LeaveCriticalSection (&lock->lock);
-}
-
-void
-glthread_rwlock_unlock (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    abort ();
-  EnterCriticalSection (&lock->lock);
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-	abort ();
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-	abort ();
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-	 locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers.count > 0)
-	{
-	  /* Wake up one of the waiting writers.  */
-	  lock->runcount--;
-	  gl_waitqueue_notify_first (&lock->waiting_writers);
-	}
-      else
-	{
-	  /* Wake up all waiting readers.  */
-	  lock->runcount += lock->waiting_readers.count;
-	  gl_waitqueue_notify_all (&lock->waiting_readers);
-	}
-    }
-  LeaveCriticalSection (&lock->lock);
-}
-
-void
-glthread_rwlock_destroy (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    abort ();
-  if (lock->runcount != 0)
-    abort ();
-  DeleteCriticalSection (&lock->lock);
-  if (lock->waiting_readers.array != NULL)
-    free (lock->waiting_readers.array);
-  if (lock->waiting_writers.array != NULL)
-    free (lock->waiting_writers.array);
-  lock->guard.done = 0;
-}
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init (gl_recursive_lock_t *lock)
-{
-  lock->owner = 0;
-  lock->depth = 0;
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-void
-glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-	/* This thread is the first one to need this lock.  Initialize it.  */
-	glthread_recursive_lock_init (lock);
-      else
-	/* Yield the CPU while waiting for another thread to finish
-	   initializing this lock.  */
-	while (!lock->guard.done)
-	  Sleep (0);
-    }
-  {
-    DWORD self = GetCurrentThreadId ();
-    if (lock->owner != self)
-      {
-	EnterCriticalSection (&lock->lock);
-	lock->owner = self;
-      }
-    if (++(lock->depth) == 0) /* wraparound? */
-      abort ();
-  }
-}
-
-void
-glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != GetCurrentThreadId ())
-    abort ();
-  if (lock->depth == 0)
-    abort ();
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = 0;
-      LeaveCriticalSection (&lock->lock);
-    }
-}
-
-void
-glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != 0)
-    abort ();
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (once_control->inited <= 0)
-    {
-      if (InterlockedIncrement (&once_control->started) == 0)
-	{
-	  /* This thread is the first one to come to this once_control.  */
-	  InitializeCriticalSection (&once_control->lock);
-	  EnterCriticalSection (&once_control->lock);
-	  once_control->inited = 0;
-	  initfunction ();
-	  once_control->inited = 1;
-	  LeaveCriticalSection (&once_control->lock);
-	}
-      else
-	{
-	  /* Undo last operation.  */
-	  InterlockedDecrement (&once_control->started);
-	  /* Some other thread has already started the initialization.
-	     Yield the CPU while waiting for the other thread to finish
-	     initializing and taking the lock.  */
-	  while (once_control->inited < 0)
-	    Sleep (0);
-	  if (once_control->inited <= 0)
-	    {
-	      /* Take the lock.  This blocks until the other thread has
-		 finished calling the initfunction.  */
-	      EnterCriticalSection (&once_control->lock);
-	      LeaveCriticalSection (&once_control->lock);
-	      if (!(once_control->inited > 0))
-		abort ();
-	    }
-	}
-    }
-}
-
-#endif
-
-/* ========================================================================= */
diff --git a/intl/lock.h b/intl/lock.h
deleted file mode 100644
index 04d136922..000000000
--- a/intl/lock.h
+++ /dev/null
@@ -1,833 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <[email protected]>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-/* This file contains locking primitives for use with a given thread library.
-   It does not contain primitives for creating threads or for other
-   synchronization primitives.
-
-   Normal (non-recursive) locks:
-     Type:                gl_lock_t
-     Declaration:         gl_lock_define(extern, name)
-     Initializer:         gl_lock_define_initialized(, name)
-     Initialization:      gl_lock_init (name);
-     Taking the lock:     gl_lock_lock (name);
-     Releasing the lock:  gl_lock_unlock (name);
-     De-initialization:   gl_lock_destroy (name);
-
-   Read-Write (non-recursive) locks:
-     Type:                gl_rwlock_t
-     Declaration:         gl_rwlock_define(extern, name)
-     Initializer:         gl_rwlock_define_initialized(, name)
-     Initialization:      gl_rwlock_init (name);
-     Taking the lock:     gl_rwlock_rdlock (name);
-                          gl_rwlock_wrlock (name);
-     Releasing the lock:  gl_rwlock_unlock (name);
-     De-initialization:   gl_rwlock_destroy (name);
-
-   Recursive locks:
-     Type:                gl_recursive_lock_t
-     Declaration:         gl_recursive_lock_define(extern, name)
-     Initializer:         gl_recursive_lock_define_initialized(, name)
-     Initialization:      gl_recursive_lock_init (name);
-     Taking the lock:     gl_recursive_lock_lock (name);
-     Releasing the lock:  gl_recursive_lock_unlock (name);
-     De-initialization:   gl_recursive_lock_destroy (name);
-
-  Once-only execution:
-     Type:                gl_once_t
-     Initializer:         gl_once_define(extern, name)
-     Execution:           gl_once (name, initfunction);
-*/
-
-
-#ifndef _LOCK_H
-#define _LOCK_H
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-# include <stdlib.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The pthread_in_use() detection needs to be done at runtime.  */
-#  define pthread_in_use() \
-     glthread_in_use ()
-extern int glthread_in_use (void);
-
-# endif
-
-# if USE_POSIX_THREADS_WEAK
-
-/* Use weak references to the POSIX threads library.  */
-
-/* Weak references avoid dragging in external libraries if the other parts
-   of the program don't use them.  Here we use them, because we don't want
-   every program that uses libintl to depend on libpthread.  This assumes
-   that libpthread would not be loaded after libintl; i.e. if libintl is
-   loaded first, by an executable that does not depend on libpthread, and
-   then a module is dynamically loaded that depends on libpthread, libintl
-   will not be multithread-safe.  */
-
-/* The way to test at runtime whether libpthread is present is to test
-   whether a function pointer's value, such as &pthread_mutex_init, is
-   non-NULL.  However, some versions of GCC have a bug through which, in
-   PIC mode, &foo != NULL always evaluates to true if there is a direct
-   call to foo(...) in the same function.  To avoid this, we test the
-   address of a function in libpthread that we don't use.  */
-
-#  pragma weak pthread_mutex_init
-#  pragma weak pthread_mutex_lock
-#  pragma weak pthread_mutex_unlock
-#  pragma weak pthread_mutex_destroy
-#  pragma weak pthread_rwlock_init
-#  pragma weak pthread_rwlock_rdlock
-#  pragma weak pthread_rwlock_wrlock
-#  pragma weak pthread_rwlock_unlock
-#  pragma weak pthread_rwlock_destroy
-#  pragma weak pthread_once
-#  pragma weak pthread_cond_init
-#  pragma weak pthread_cond_wait
-#  pragma weak pthread_cond_signal
-#  pragma weak pthread_cond_broadcast
-#  pragma weak pthread_cond_destroy
-#  pragma weak pthread_mutexattr_init
-#  pragma weak pthread_mutexattr_settype
-#  pragma weak pthread_mutexattr_destroy
-#  ifndef pthread_self
-#   pragma weak pthread_self
-#  endif
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   pragma weak pthread_cancel
-#   define pthread_in_use() (pthread_cancel != NULL)
-#  endif
-
-# else
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   define pthread_in_use() 1
-#  endif
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pthread_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTHREAD_MUTEX_INITIALIZER
-# define gl_lock_init(NAME) \
-    if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) abort ()
-# define gl_lock_lock(NAME) \
-    if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) abort ()
-# define gl_lock_unlock(NAME) \
-    if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) abort ()
-# define gl_lock_destroy(NAME) \
-    if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) abort ()
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  ifdef PTHREAD_RWLOCK_INITIALIZER
-
-typedef pthread_rwlock_t gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      PTHREAD_RWLOCK_INITIALIZER
-#   define gl_rwlock_init(NAME) \
-      if (pthread_in_use () && pthread_rwlock_init (&NAME, NULL) != 0) abort ()
-#   define gl_rwlock_rdlock(NAME) \
-      if (pthread_in_use () && pthread_rwlock_rdlock (&NAME) != 0) abort ()
-#   define gl_rwlock_wrlock(NAME) \
-      if (pthread_in_use () && pthread_rwlock_wrlock (&NAME) != 0) abort ()
-#   define gl_rwlock_unlock(NAME) \
-      if (pthread_in_use () && pthread_rwlock_unlock (&NAME) != 0) abort ()
-#   define gl_rwlock_destroy(NAME) \
-      if (pthread_in_use () && pthread_rwlock_destroy (&NAME) != 0) abort ()
-
-#  else
-
-typedef struct
-        {
-          int initialized;
-          pthread_mutex_t guard;   /* protects the initialization */
-          pthread_rwlock_t rwlock; /* read-write lock */
-        }
-        gl_rwlock_t;
-#   define gl_rwlock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME;
-#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-#   define gl_rwlock_initializer \
-      { 0, PTHREAD_MUTEX_INITIALIZER }
-#   define gl_rwlock_init(NAME) \
-      if (pthread_in_use ()) glthread_rwlock_init (&NAME)
-#   define gl_rwlock_rdlock(NAME) \
-      if (pthread_in_use ()) glthread_rwlock_rdlock (&NAME)
-#   define gl_rwlock_wrlock(NAME) \
-      if (pthread_in_use ()) glthread_rwlock_wrlock (&NAME)
-#   define gl_rwlock_unlock(NAME) \
-      if (pthread_in_use ()) glthread_rwlock_unlock (&NAME)
-#   define gl_rwlock_destroy(NAME) \
-      if (pthread_in_use ()) glthread_rwlock_destroy (&NAME)
-extern void glthread_rwlock_init (gl_rwlock_t *lock);
-extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
-
-#  endif
-
-# else
-
-typedef struct
-        {
-          pthread_mutex_t lock; /* protects the remaining fields */
-          pthread_cond_t waiting_readers; /* waiting readers */
-          pthread_cond_t waiting_writers; /* waiting writers */
-          unsigned int waiting_writers_count; /* number of waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
-# define gl_rwlock_init(NAME) \
-    if (pthread_in_use ()) glthread_rwlock_init (&NAME)
-# define gl_rwlock_rdlock(NAME) \
-    if (pthread_in_use ()) glthread_rwlock_rdlock (&NAME)
-# define gl_rwlock_wrlock(NAME) \
-    if (pthread_in_use ()) glthread_rwlock_wrlock (&NAME)
-# define gl_rwlock_unlock(NAME) \
-    if (pthread_in_use ()) glthread_rwlock_unlock (&NAME)
-# define gl_rwlock_destroy(NAME) \
-    if (pthread_in_use ()) glthread_rwlock_destroy (&NAME)
-extern void glthread_rwlock_init (gl_rwlock_t *lock);
-extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-typedef pthread_mutex_t gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
-#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#   else
-#    define gl_recursive_lock_initializer \
-       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#   endif
-#   define gl_recursive_lock_init(NAME) \
-      if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) abort ()
-#   define gl_recursive_lock_lock(NAME) \
-      if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) abort ()
-#   define gl_recursive_lock_unlock(NAME) \
-      if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) abort ()
-#   define gl_recursive_lock_destroy(NAME) \
-      if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) abort ()
-
-#  else
-
-typedef struct
-        {
-          pthread_mutex_t recmutex; /* recursive mutex */
-          pthread_mutex_t guard;    /* protects the initialization */
-          int initialized;
-        }
-        gl_recursive_lock_t;
-#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME;
-#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#   define gl_recursive_lock_initializer \
-      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
-#   define gl_recursive_lock_init(NAME) \
-      if (pthread_in_use ()) glthread_recursive_lock_init (&NAME)
-#   define gl_recursive_lock_lock(NAME) \
-      if (pthread_in_use ()) glthread_recursive_lock_lock (&NAME)
-#   define gl_recursive_lock_unlock(NAME) \
-      if (pthread_in_use ()) glthread_recursive_lock_unlock (&NAME)
-#   define gl_recursive_lock_destroy(NAME) \
-      if (pthread_in_use ()) glthread_recursive_lock_destroy (&NAME)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
-
-#  endif
-
-# else
-
-/* Old versions of POSIX threads on Solaris did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          pthread_mutex_t mutex;
-          pthread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
-#  define gl_recursive_lock_init(NAME) \
-     if (pthread_in_use ()) glthread_recursive_lock_init (&NAME)
-#  define gl_recursive_lock_lock(NAME) \
-     if (pthread_in_use ()) glthread_recursive_lock_lock (&NAME)
-#  define gl_recursive_lock_unlock(NAME) \
-     if (pthread_in_use ()) glthread_recursive_lock_unlock (&NAME)
-#  define gl_recursive_lock_destroy(NAME) \
-     if (pthread_in_use ()) glthread_recursive_lock_destroy (&NAME)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pthread_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
-# define gl_once(NAME, INITFUNCTION) \
-    do                                                   \
-      {                                                  \
-        if (pthread_in_use ())                           \
-          {                                              \
-            if (pthread_once (&NAME, INITFUNCTION) != 0) \
-              abort ();                                  \
-          }                                              \
-        else                                             \
-          {                                              \
-            if (glthread_once_singlethreaded (&NAME))    \
-              INITFUNCTION ();                           \
-          }                                              \
-      }                                                  \
-    while (0)
-extern int glthread_once_singlethreaded (pthread_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-# include <pth.h>
-# include <stdlib.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_PTH_THREADS_WEAK
-
-/* Use weak references to the GNU Pth threads library.  */
-
-#  pragma weak pth_mutex_init
-#  pragma weak pth_mutex_acquire
-#  pragma weak pth_mutex_release
-#  pragma weak pth_rwlock_init
-#  pragma weak pth_rwlock_acquire
-#  pragma weak pth_rwlock_release
-#  pragma weak pth_once
-
-#  pragma weak pth_cancel
-#  define pth_in_use() (pth_cancel != NULL)
-
-# else
-
-#  define pth_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pth_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    PTH_MUTEX_INIT
-# define gl_lock_init(NAME) \
-    if (pth_in_use() && !pth_mutex_init (&NAME)) abort ()
-# define gl_lock_lock(NAME) \
-    if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) abort ()
-# define gl_lock_unlock(NAME) \
-    if (pth_in_use() && !pth_mutex_release (&NAME)) abort ()
-# define gl_lock_destroy(NAME) \
-    (void)(&NAME)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef pth_rwlock_t gl_rwlock_t;
-#  define gl_rwlock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME;
-#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
-#  define gl_rwlock_initializer \
-     PTH_RWLOCK_INIT
-#  define gl_rwlock_init(NAME) \
-     if (pth_in_use() && !pth_rwlock_init (&NAME)) abort ()
-#  define gl_rwlock_rdlock(NAME) \
-     if (pth_in_use() && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RD, 0, NULL)) abort ()
-#  define gl_rwlock_wrlock(NAME) \
-     if (pth_in_use() && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RW, 0, NULL)) abort ()
-#  define gl_rwlock_unlock(NAME) \
-     if (pth_in_use() && !pth_rwlock_release (&NAME)) abort ()
-#  define gl_rwlock_destroy(NAME) \
-     (void)(&NAME)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* In Pth, mutexes are recursive by default.  */
-typedef pth_mutex_t gl_recursive_lock_t;
-#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME;
-#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-     STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
-#  define gl_recursive_lock_initializer \
-     PTH_MUTEX_INIT
-#  define gl_recursive_lock_init(NAME) \
-     if (pth_in_use() && !pth_mutex_init (&NAME)) abort ()
-#  define gl_recursive_lock_lock(NAME) \
-     if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) abort ()
-#  define gl_recursive_lock_unlock(NAME) \
-     if (pth_in_use() && !pth_mutex_release (&NAME)) abort ()
-#  define gl_recursive_lock_destroy(NAME) \
-     (void)(&NAME)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pth_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
-# define gl_once(NAME, INITFUNCTION) \
-    do                                                                \
-      {                                                               \
-        if (pth_in_use ())                                            \
-          {                                                           \
-            void (*gl_once_temp) (void) = INITFUNCTION;               \
-            if (!pth_once (&NAME, glthread_once_call, &gl_once_temp)) \
-              abort ();                                               \
-          }                                                           \
-        else                                                          \
-          {                                                           \
-            if (glthread_once_singlethreaded (&NAME))                 \
-              INITFUNCTION ();                                        \
-          }                                                           \
-      }                                                               \
-    while (0)
-extern void glthread_once_call (void *arg);
-extern int glthread_once_singlethreaded (pth_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-# include <thread.h>
-# include <synch.h>
-# include <stdlib.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_SOLARIS_THREADS_WEAK
-
-/* Use weak references to the old Solaris threads library.  */
-
-#  pragma weak mutex_init
-#  pragma weak mutex_lock
-#  pragma weak mutex_unlock
-#  pragma weak mutex_destroy
-#  pragma weak rwlock_init
-#  pragma weak rw_rdlock
-#  pragma weak rw_wrlock
-#  pragma weak rw_unlock
-#  pragma weak rwlock_destroy
-#  pragma weak thr_self
-
-#  pragma weak thr_suspend
-#  define thread_in_use() (thr_suspend != NULL)
-
-# else
-
-#  define thread_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    DEFAULTMUTEX
-# define gl_lock_init(NAME) \
-    if (thread_in_use () && mutex_init (&NAME, USYNC_THREAD, NULL) != 0) abort ()
-# define gl_lock_lock(NAME) \
-    if (thread_in_use () && mutex_lock (&NAME) != 0) abort ()
-# define gl_lock_unlock(NAME) \
-    if (thread_in_use () && mutex_unlock (&NAME) != 0) abort ()
-# define gl_lock_destroy(NAME) \
-    if (thread_in_use () && mutex_destroy (&NAME) != 0) abort ()
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef rwlock_t gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    DEFAULTRWLOCK
-# define gl_rwlock_init(NAME) \
-    if (thread_in_use () && rwlock_init (&NAME, USYNC_THREAD, NULL) != 0) abort ()
-# define gl_rwlock_rdlock(NAME) \
-    if (thread_in_use () && rw_rdlock (&NAME) != 0) abort ()
-# define gl_rwlock_wrlock(NAME) \
-    if (thread_in_use () && rw_wrlock (&NAME) != 0) abort ()
-# define gl_rwlock_unlock(NAME) \
-    if (thread_in_use () && rw_unlock (&NAME) != 0) abort ()
-# define gl_rwlock_destroy(NAME) \
-    if (thread_in_use () && rwlock_destroy (&NAME) != 0) abort ()
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* Old Solaris threads did not have recursive locks.
-   We have to implement them ourselves.  */
-
-typedef struct
-        {
-          mutex_t mutex;
-          thread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { DEFAULTMUTEX, (thread_t) 0, 0 }
-# define gl_recursive_lock_init(NAME) \
-    if (thread_in_use ()) glthread_recursive_lock_init (&NAME)
-# define gl_recursive_lock_lock(NAME) \
-    if (thread_in_use ()) glthread_recursive_lock_lock (&NAME)
-# define gl_recursive_lock_unlock(NAME) \
-    if (thread_in_use ()) glthread_recursive_lock_unlock (&NAME)
-# define gl_recursive_lock_destroy(NAME) \
-    if (thread_in_use ()) glthread_recursive_lock_destroy (&NAME)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          mutex_t mutex;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
-# define gl_once(NAME, INITFUNCTION) \
-    do                                                \
-      {                                               \
-        if (thread_in_use ())                         \
-          {                                           \
-            glthread_once (&NAME, INITFUNCTION);      \
-          }                                           \
-        else                                          \
-          {                                           \
-            if (glthread_once_singlethreaded (&NAME)) \
-              INITFUNCTION ();                        \
-          }                                           \
-      }                                               \
-    while (0)
-extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (gl_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WIN32_THREADS
-
-# include <windows.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
-   Semaphore types, because
-     - we need only to synchronize inside a single process (address space),
-       not inter-process locking,
-     - we don't need to support trylock operations.  (TryEnterCriticalSection
-       does not work on Windows 95/98/ME.  Packages that need trylock usually
-       define their own mutex type.)  */
-
-/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
-   to be done lazily, once only.  For this we need spinlocks.  */
-
-typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock;
-        }
-        gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
-    { { 0, -1 } }
-# define gl_lock_init(NAME) \
-    glthread_lock_init (&NAME)
-# define gl_lock_lock(NAME) \
-    glthread_lock_lock (&NAME)
-# define gl_lock_unlock(NAME) \
-    glthread_lock_unlock (&NAME)
-# define gl_lock_destroy(NAME) \
-    glthread_lock_destroy (&NAME)
-extern void glthread_lock_init (gl_lock_t *lock);
-extern void glthread_lock_lock (gl_lock_t *lock);
-extern void glthread_lock_unlock (gl_lock_t *lock);
-extern void glthread_lock_destroy (gl_lock_t *lock);
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* It is impossible to implement read-write locks using plain locks, without
-   introducing an extra thread dedicated to managing read-write locks.
-   Therefore here we need to use the low-level Event type.  */
-
-typedef struct
-        {
-          HANDLE *array; /* array of waiting threads, each represented by an event */
-          unsigned int count; /* number of waiting threads */
-          unsigned int alloc; /* length of allocated array */
-          unsigned int offset; /* index of first waiting thread in array */
-        }
-        gl_waitqueue_t;
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          CRITICAL_SECTION lock; /* protects the remaining fields */
-          gl_waitqueue_t waiting_readers; /* waiting readers */
-          gl_waitqueue_t waiting_writers; /* waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
-    { { 0, -1 } }
-# define gl_rwlock_init(NAME) \
-    glthread_rwlock_init (&NAME)
-# define gl_rwlock_rdlock(NAME) \
-    glthread_rwlock_rdlock (&NAME)
-# define gl_rwlock_wrlock(NAME) \
-    glthread_rwlock_wrlock (&NAME)
-# define gl_rwlock_unlock(NAME) \
-    glthread_rwlock_unlock (&NAME)
-# define gl_rwlock_destroy(NAME) \
-    glthread_rwlock_destroy (&NAME)
-extern void glthread_rwlock_init (gl_rwlock_t *lock);
-extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* The Win32 documentation says that CRITICAL_SECTION already implements a
-   recursive lock.  But we need not rely on it: It's easy to implement a
-   recursive lock without this assumption.  */
-
-typedef struct
-        {
-          gl_spinlock_t guard; /* protects the initialization */
-          DWORD owner;
-          unsigned long depth;
-          CRITICAL_SECTION lock;
-        }
-        gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
-    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
-    { { 0, -1 }, 0, 0 }
-# define gl_recursive_lock_init(NAME) \
-    glthread_recursive_lock_init (&NAME)
-# define gl_recursive_lock_lock(NAME) \
-    glthread_recursive_lock_lock (&NAME)
-# define gl_recursive_lock_unlock(NAME) \
-    glthread_recursive_lock_unlock (&NAME)
-# define gl_recursive_lock_destroy(NAME) \
-    glthread_recursive_lock_destroy (&NAME)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
-        {
-          volatile int inited;
-          volatile long started;
-          CRITICAL_SECTION lock;
-        }
-        gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = { -1, -1 };
-# define gl_once(NAME, INITFUNCTION) \
-    glthread_once (&NAME, INITFUNCTION)
-extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void));
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
-
-/* Provide dummy implementation if threads are not supported.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef int gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME)
-# define gl_lock_define_initialized(STORAGECLASS, NAME)
-# define gl_lock_init(NAME)
-# define gl_lock_lock(NAME)
-# define gl_lock_unlock(NAME)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef int gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME)
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
-# define gl_rwlock_init(NAME)
-# define gl_rwlock_rdlock(NAME)
-# define gl_rwlock_wrlock(NAME)
-# define gl_rwlock_unlock(NAME)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-typedef int gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME)
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
-# define gl_recursive_lock_init(NAME)
-# define gl_recursive_lock_lock(NAME)
-# define gl_recursive_lock_unlock(NAME)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef int gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = 0;
-# define gl_once(NAME, INITFUNCTION) \
-    do                       \
-      {                      \
-        if (NAME == 0)       \
-          {                  \
-            NAME = ~ 0;      \
-            INITFUNCTION (); \
-          }                  \
-      }                      \
-    while (0)
-
-#endif
-
-/* ========================================================================= */
-
-#endif /* _LOCK_H */
diff --git a/intl/log.c b/intl/log.c
deleted file mode 100644
index e3ab5d0e6..000000000
--- a/intl/log.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Log file output.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Written by Bruno Haible <[email protected]>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-# include "lock.h"
-#endif
-
-/* Print an ASCII string with quotes and escape sequences where needed.  */
-static void
-print_escaped (FILE *stream, const char *str)
-{
-  putc ('"', stream);
-  for (; *str != '\0'; str++)
-    if (*str == '\n')
-      {
-	fputs ("\\n\"", stream);
-	if (str[1] == '\0')
-	  return;
-	fputs ("\n\"", stream);
-      }
-    else
-      {
-	if (*str == '"' || *str == '\\')
-	  putc ('\\', stream);
-	putc (*str, stream);
-      }
-  putc ('"', stream);
-}
-
-static char *last_logfilename = NULL;
-static FILE *last_logfile = NULL;
-__libc_lock_define_initialized (static, lock)
-
-static inline void
-_nl_log_untranslated_locked (const char *logfilename, const char *domainname,
-			     const char *msgid1, const char *msgid2, int plural)
-{
-  FILE *logfile;
-
-  /* Can we reuse the last opened logfile?  */
-  if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
-    {
-      /* Close the last used logfile.  */
-      if (last_logfilename != NULL)
-	{
-	  if (last_logfile != NULL)
-	    {
-	      fclose (last_logfile);
-	      last_logfile = NULL;
-	    }
-	  free (last_logfilename);
-	  last_logfilename = NULL;
-	}
-      /* Open the logfile.  */
-      last_logfilename = (char *) malloc (strlen (logfilename) + 1);
-      if (last_logfilename == NULL)
-	return;
-      strcpy (last_logfilename, logfilename);
-      last_logfile = fopen (logfilename, "a");
-      if (last_logfile == NULL)
-	return;
-    }
-  logfile = last_logfile;
-
-  fprintf (logfile, "domain ");
-  print_escaped (logfile, domainname);
-  fprintf (logfile, "\nmsgid ");
-  print_escaped (logfile, msgid1);
-  if (plural)
-    {
-      fprintf (logfile, "\nmsgid_plural ");
-      print_escaped (logfile, msgid2);
-      fprintf (logfile, "\nmsgstr[0] \"\"\n");
-    }
-  else
-    fprintf (logfile, "\nmsgstr \"\"\n");
-  putc ('\n', logfile);
-}
-
-/* Add to the log file an entry denoting a failed translation.  */
-void
-_nl_log_untranslated (const char *logfilename, const char *domainname,
-		      const char *msgid1, const char *msgid2, int plural)
-{
-  __libc_lock_lock (lock);
-  _nl_log_untranslated_locked (logfilename, domainname, msgid1, msgid2, plural);
-  __libc_lock_unlock (lock);
-}
diff --git a/intl/ngettext.c b/intl/ngettext.c
deleted file mode 100644
index a33529c20..000000000
--- a/intl/ngettext.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT libintl_ngettext
-# define DCNGETTEXT libintl_dcngettext
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif
diff --git a/intl/os2compat.c b/intl/os2compat.c
deleted file mode 100644
index d041de2af..000000000
--- a/intl/os2compat.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* OS/2 compatibility functions.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#define OS2_AWARE
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-/* A version of getenv() that works from DLLs */
-extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
-
-char *
-_nl_getenv (const char *name)
-{
-  unsigned char *value;
-  if (DosScanEnv (name, &value))
-    return NULL;
-  else
-    return value;
-}
-
-/* A fixed size buffer.  */
-char libintl_nl_default_dirname[MAXPATHLEN+1];
-
-char *_nlos2_libdir = NULL;
-char *_nlos2_localealiaspath = NULL;
-char *_nlos2_localedir = NULL;
-
-static __attribute__((constructor)) void
-nlos2_initialize ()
-{
-  char *root = getenv ("UNIXROOT");
-  char *gnulocaledir = getenv ("GNULOCALEDIR");
-
-  _nlos2_libdir = gnulocaledir;
-  if (!_nlos2_libdir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
-          memcpy (_nlos2_libdir, root, sl);
-          memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
-        }
-      else
-        _nlos2_libdir = LIBDIR;
-    }
-
-  _nlos2_localealiaspath = gnulocaledir;
-  if (!_nlos2_localealiaspath)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
-          memcpy (_nlos2_localealiaspath, root, sl);
-          memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
-        }
-     else
-        _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
-    }
-
-  _nlos2_localedir = gnulocaledir;
-  if (!_nlos2_localedir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
-          memcpy (_nlos2_localedir, root, sl);
-          memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
-        }
-      else
-        _nlos2_localedir = LOCALEDIR;
-    }
-
-  if (strlen (_nlos2_localedir) <= MAXPATHLEN)
-    strcpy (libintl_nl_default_dirname, _nlos2_localedir);
-}
diff --git a/intl/os2compat.h b/intl/os2compat.h
deleted file mode 100644
index a18d582cd..000000000
--- a/intl/os2compat.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* OS/2 compatibility defines.
-   This file is intended to be included from config.h
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* When included from os2compat.h we need all the original definitions */
-#ifndef OS2_AWARE
-
-#undef LIBDIR
-#define LIBDIR			_nlos2_libdir
-extern char *_nlos2_libdir;
-
-#undef LOCALEDIR
-#define LOCALEDIR		_nlos2_localedir
-extern char *_nlos2_localedir;
-
-#undef LOCALE_ALIAS_PATH
-#define LOCALE_ALIAS_PATH	_nlos2_localealiaspath
-extern char *_nlos2_localealiaspath;
-
-#endif
-
-#undef HAVE_STRCASECMP
-#define HAVE_STRCASECMP 1
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
-/* We have our own getenv() which works even if library is compiled as DLL */
-#define getenv _nl_getenv
-
-/* Older versions of gettext used -1 as the value of LC_MESSAGES */
-#define LC_MESSAGES_COMPAT (-1)
diff --git a/intl/osdep.c b/intl/osdep.c
deleted file mode 100644
index 3cc35c03b..000000000
--- a/intl/osdep.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* OS dependent parts of libintl.
-   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#if defined __CYGWIN__
-# include "intl-exports.c"
-#elif defined __EMX__
-# include "os2compat.c"
-#else
-/* Avoid AIX compiler warning.  */
-typedef int dummy;
-#endif
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
deleted file mode 100644
index f518bf1dc..000000000
--- a/intl/plural-exp.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "plural-exp.h"
-
-#if (defined __GNUC__ && !(__APPLE_CC__ > 1)) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-struct expression GERMANIC_PLURAL =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-struct expression GERMANIC_PLURAL;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      GERMANIC_PLURAL.nargs = 2;
-      GERMANIC_PLURAL.operation = not_equal;
-      GERMANIC_PLURAL.val.args[0] = &plvar;
-      GERMANIC_PLURAL.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-void
-internal_function
-EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
-			   unsigned long int *npluralsp)
-{
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  /* First get the number.  */
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
-	    ++nplurals;
-	  if (!(*nplurals >= '0' && *nplurals <= '9'))
-	    goto no_plural;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  if (nplurals == endp)
-	    goto no_plural;
-	  *npluralsp = n;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  *pluralp = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      *pluralp = &GERMANIC_PLURAL;
-      *npluralsp = 2;
-    }
-}
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
deleted file mode 100644
index dc590d374..000000000
--- a/intl/plural-exp.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000-2003, 2005 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _PLURAL_EXP_H
-#define _PLURAL_EXP_H
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Modulo operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparison for equality.  */
-    not_equal,			/* Comparison for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* Names for the libintl functions are a problem.  This source code is used
-   1. in the GNU C Library library,
-   2. in the GNU libintl library,
-   3. in the GNU gettext tools.
-   The function names in each situation must be different, to allow for
-   binary incompatible changes in 'struct expression'.  Furthermore,
-   1. in the GNU C Library library, the names have a __ prefix,
-   2.+3. in the GNU libintl library and in the GNU gettext tools, the names
-         must follow ANSI C and not start with __.
-   So we have to distinguish the three cases.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-# define PLURAL_PARSE __gettextparse
-# define GERMANIC_PLURAL __gettext_germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
-#elif defined (IN_LIBINTL)
-# define FREE_EXPRESSION libintl_gettext_free_exp
-# define PLURAL_PARSE libintl_gettextparse
-# define GERMANIC_PLURAL libintl_gettext_germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
-#else
-# define FREE_EXPRESSION free_plural_expression
-# define PLURAL_PARSE parse_plural_expression
-# define GERMANIC_PLURAL germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
-#endif
-
-extern void FREE_EXPRESSION (struct expression *exp)
-     internal_function;
-extern int PLURAL_PARSE (void *arg);
-extern struct expression GERMANIC_PLURAL attribute_hidden;
-extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
-				       struct expression **pluralp,
-				       unsigned long int *npluralsp)
-     internal_function;
-
-#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
-extern unsigned long int plural_eval (struct expression *pexp,
-				      unsigned long int n);
-#endif
-
-#endif /* _PLURAL_EXP_H */
diff --git a/intl/plural.c b/intl/plural.c
deleted file mode 100644
index 5f73b403f..000000000
--- a/intl/plural.c
+++ /dev/null
@@ -1,1492 +0,0 @@
-/* A Bison parser, made from plural.y
-   by GNU bison 1.35.  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
-# define	EQUOP2	257
-# define	CMPOP2	258
-# define	ADDOP2	259
-# define	MULOP2	260
-# define	NUMBER	261
-
-#line 1 "plural.y"
-
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
-   to put this declaration at the beginning of the file.  The declaration in
-   bison's skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.
-   This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
-   but we want it to be called PLURAL_PARSE.  */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-
-#line 51 "plural.y"
-#ifndef YYSTYPE
-typedef union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-} yystype;
-# define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-#line 57 "plural.y"
-
-/* Prototypes for local functions.  */
-static int yylex (YYSTYPE *lval, const char **pexp);
-static void yyerror (const char *str);
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (int nargs, enum operator op, struct expression * const *args)
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (enum operator op)
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (enum operator op, struct expression *right)
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (enum operator op, struct expression *bexp,
-	   struct expression *tbranch, struct expression *fbranch)
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-
-
-#define	YYFINAL		27
-#define	YYFLAG		-32768
-#define	YYNTBASE	16
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    10,     2,     2,     2,     2,     5,     2,
-      14,    15,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    12,     2,
-       2,     2,     2,     3,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-      13,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     4,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     6,     7,     8,
-       9,    11
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     2,     8,    12,    16,    20,    24,    28,    32,
-      35,    37,    39
-};
-static const short yyrhs[] =
-{
-      17,     0,    17,     3,    17,    12,    17,     0,    17,     4,
-      17,     0,    17,     5,    17,     0,    17,     6,    17,     0,
-      17,     7,    17,     0,    17,     8,    17,     0,    17,     9,
-      17,     0,    10,    17,     0,    13,     0,    11,     0,    14,
-      17,    15,     0
-};
-
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,   152,   160,   164,   168,   172,   176,   180,   184,   188,
-     192,   196,   201
-};
-#endif
-
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", 
-  "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", 
-  "start", "exp", 0
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    16,    17,    17,    17,    17,    17,    17,    17,    17,
-      17,    17,    17
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     1,     5,     3,     3,     3,     3,     3,     3,     2,
-       1,     1,     3
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       0,     0,    11,    10,     0,     1,     9,     0,     0,     0,
-       0,     0,     0,     0,     0,    12,     0,     3,     4,     5,
-       6,     7,     8,     0,     2,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-      25,     5
-};
-
-static const short yypact[] =
-{
-      -9,    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,
-      -9,    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,
-      26,    -3,-32768,    -9,    34,    21,    53,-32768
-};
-
-static const short yypgoto[] =
-{
-  -32768,    -1
-};
-
-
-#define	YYLAST		53
-
-
-static const short yytable[] =
-{
-       6,     1,     2,     7,     3,     4,    14,    16,    17,    18,
-      19,    20,    21,    22,     8,     9,    10,    11,    12,    13,
-      14,    26,    24,    12,    13,    14,    15,     8,     9,    10,
-      11,    12,    13,    14,    13,    14,    23,     8,     9,    10,
-      11,    12,    13,    14,    10,    11,    12,    13,    14,    11,
-      12,    13,    14,    27
-};
-
-static const short yycheck[] =
-{
-       1,    10,    11,     4,    13,    14,     9,     8,     9,    10,
-      11,    12,    13,    14,     3,     4,     5,     6,     7,     8,
-       9,     0,    23,     7,     8,     9,    15,     3,     4,     5,
-       6,     7,     8,     9,     8,     9,    12,     3,     4,     5,
-       6,     7,     8,     9,     5,     6,     7,     8,     9,     6,
-       7,     8,     9,     0
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-# endif
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-#ifdef YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-#endif
-
-#line 315 "bison.simple"
-
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
-
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
-
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
-#endif
-
-
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack. */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
-
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-# endif
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 1:
-#line 153 "plural.y"
-{
-	    if (yyvsp[0].exp == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
-	  }
-    break;
-case 2:
-#line 161 "plural.y"
-{
-	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 3:
-#line 165 "plural.y"
-{
-	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 4:
-#line 169 "plural.y"
-{
-	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 5:
-#line 173 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 6:
-#line 177 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 7:
-#line 181 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 8:
-#line 185 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  }
-    break;
-case 9:
-#line 189 "plural.y"
-{
-	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
-	  }
-    break;
-case 10:
-#line 193 "plural.y"
-{
-	    yyval.exp = new_exp_0 (var);
-	  }
-    break;
-case 11:
-#line 197 "plural.y"
-{
-	    if ((yyval.exp = new_exp_0 (num)) != NULL)
-	      yyval.exp->val.num = yyvsp[0].num;
-	  }
-    break;
-case 12:
-#line 202 "plural.y"
-{
-	    yyval.exp = yyvsp[-1].exp;
-	  }
-    break;
-}
-
-#line 705 "bison.simple"
-
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-	yyerror ("parse error");
-    }
-  goto yyerrlab1;
-
-
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
-
-
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-#line 207 "plural.y"
-
-
-void
-internal_function
-FREE_EXPRESSION (struct expression *exp)
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (YYSTYPE *lval, const char **pexp)
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (const char *str)
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/intl/plural.y b/intl/plural.y
deleted file mode 100644
index 45d68e949..000000000
--- a/intl/plural.y
+++ /dev/null
@@ -1,383 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <[email protected]>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
-   to put this declaration at the beginning of the file.  The declaration in
-   bison's skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.
-   This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
-   but we want it to be called PLURAL_PARSE.  */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 7
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static int yylex (YYSTYPE *lval, const char **pexp);
-static void yyerror (const char *str);
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (int nargs, enum operator op, struct expression * const *args)
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (enum operator op)
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (enum operator op, struct expression *right)
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (enum operator op, struct expression *bexp,
-	   struct expression *tbranch, struct expression *fbranch)
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (struct expression *exp)
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (YYSTYPE *lval, const char **pexp)
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (const char *str)
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/intl/printf-args.c b/intl/printf-args.c
deleted file mode 100644
index ee0faba16..000000000
--- a/intl/printf-args.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "printf-args.h"
-
-#ifdef STATIC
-STATIC
-#endif
-int
-printf_fetchargs (va_list args, arguments *a)
-{
-  size_t i;
-  argument *ap;
-
-  for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
-    switch (ap->type)
-      {
-      case TYPE_SCHAR:
-	ap->a.a_schar = va_arg (args, /*signed char*/ int);
-	break;
-      case TYPE_UCHAR:
-	ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
-	break;
-      case TYPE_SHORT:
-	ap->a.a_short = va_arg (args, /*short*/ int);
-	break;
-      case TYPE_USHORT:
-	ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
-	break;
-      case TYPE_INT:
-	ap->a.a_int = va_arg (args, int);
-	break;
-      case TYPE_UINT:
-	ap->a.a_uint = va_arg (args, unsigned int);
-	break;
-      case TYPE_LONGINT:
-	ap->a.a_longint = va_arg (args, long int);
-	break;
-      case TYPE_ULONGINT:
-	ap->a.a_ulongint = va_arg (args, unsigned long int);
-	break;
-#ifdef HAVE_LONG_LONG_INT
-      case TYPE_LONGLONGINT:
-	ap->a.a_longlongint = va_arg (args, long long int);
-	break;
-      case TYPE_ULONGLONGINT:
-	ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
-	break;
-#endif
-      case TYPE_DOUBLE:
-	ap->a.a_double = va_arg (args, double);
-	break;
-#ifdef HAVE_LONG_DOUBLE
-      case TYPE_LONGDOUBLE:
-	ap->a.a_longdouble = va_arg (args, long double);
-	break;
-#endif
-      case TYPE_CHAR:
-	ap->a.a_char = va_arg (args, int);
-	break;
-#ifdef HAVE_WINT_T
-      case TYPE_WIDE_CHAR:
-	/* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by
-	   default argument promotions", this is not the case in mingw32,
-	   where wint_t is 'unsigned short'.  */
-	ap->a.a_wide_char =
-	  (sizeof (wint_t) < sizeof (int)
-	   ? va_arg (args, int)
-	   : va_arg (args, wint_t));
-	break;
-#endif
-      case TYPE_STRING:
-	ap->a.a_string = va_arg (args, const char *);
-	/* A null pointer is an invalid argument for "%s", but in practice
-	   it occurs quite frequently in printf statements that produce
-	   debug output.  Use a fallback in this case.  */
-	if (ap->a.a_string == NULL)
-	  ap->a.a_string = "(NULL)";
-	break;
-#ifdef HAVE_WCHAR_T
-      case TYPE_WIDE_STRING:
-	ap->a.a_wide_string = va_arg (args, const wchar_t *);
-	/* A null pointer is an invalid argument for "%ls", but in practice
-	   it occurs quite frequently in printf statements that produce
-	   debug output.  Use a fallback in this case.  */
-	if (ap->a.a_wide_string == NULL)
-	  {
-	    static const wchar_t wide_null_string[] =
-	      {
-		(wchar_t)'(',
-		(wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L',
-		(wchar_t)')',
-		(wchar_t)0
-	      };
-	    ap->a.a_wide_string = wide_null_string;
-	  }
-	break;
-#endif
-      case TYPE_POINTER:
-	ap->a.a_pointer = va_arg (args, void *);
-	break;
-      case TYPE_COUNT_SCHAR_POINTER:
-	ap->a.a_count_schar_pointer = va_arg (args, signed char *);
-	break;
-      case TYPE_COUNT_SHORT_POINTER:
-	ap->a.a_count_short_pointer = va_arg (args, short *);
-	break;
-      case TYPE_COUNT_INT_POINTER:
-	ap->a.a_count_int_pointer = va_arg (args, int *);
-	break;
-      case TYPE_COUNT_LONGINT_POINTER:
-	ap->a.a_count_longint_pointer = va_arg (args, long int *);
-	break;
-#ifdef HAVE_LONG_LONG_INT
-      case TYPE_COUNT_LONGLONGINT_POINTER:
-	ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
-	break;
-#endif
-      default:
-	/* Unknown type.  */
-	return -1;
-      }
-  return 0;
-}
diff --git a/intl/printf-args.h b/intl/printf-args.h
deleted file mode 100644
index 886febe66..000000000
--- a/intl/printf-args.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _PRINTF_ARGS_H
-#define _PRINTF_ARGS_H
-
-/* Get size_t.  */
-#include <stddef.h>
-
-/* Get wchar_t.  */
-#ifdef HAVE_WCHAR_T
-# include <stddef.h>
-#endif
-
-/* Get wint_t.  */
-#ifdef HAVE_WINT_T
-# include <wchar.h>
-#endif
-
-/* Get va_list.  */
-#include <stdarg.h>
-
-
-/* Argument types */
-typedef enum
-{
-  TYPE_NONE,
-  TYPE_SCHAR,
-  TYPE_UCHAR,
-  TYPE_SHORT,
-  TYPE_USHORT,
-  TYPE_INT,
-  TYPE_UINT,
-  TYPE_LONGINT,
-  TYPE_ULONGINT,
-#ifdef HAVE_LONG_LONG_INT
-  TYPE_LONGLONGINT,
-  TYPE_ULONGLONGINT,
-#endif
-  TYPE_DOUBLE,
-#ifdef HAVE_LONG_DOUBLE
-  TYPE_LONGDOUBLE,
-#endif
-  TYPE_CHAR,
-#ifdef HAVE_WINT_T
-  TYPE_WIDE_CHAR,
-#endif
-  TYPE_STRING,
-#ifdef HAVE_WCHAR_T
-  TYPE_WIDE_STRING,
-#endif
-  TYPE_POINTER,
-  TYPE_COUNT_SCHAR_POINTER,
-  TYPE_COUNT_SHORT_POINTER,
-  TYPE_COUNT_INT_POINTER,
-  TYPE_COUNT_LONGINT_POINTER
-#ifdef HAVE_LONG_LONG_INT
-, TYPE_COUNT_LONGLONGINT_POINTER
-#endif
-} arg_type;
-
-/* Polymorphic argument */
-typedef struct
-{
-  arg_type type;
-  union
-  {
-    signed char			a_schar;
-    unsigned char		a_uchar;
-    short			a_short;
-    unsigned short		a_ushort;
-    int				a_int;
-    unsigned int		a_uint;
-    long int			a_longint;
-    unsigned long int		a_ulongint;
-#ifdef HAVE_LONG_LONG_INT
-    long long int		a_longlongint;
-    unsigned long long int	a_ulonglongint;
-#endif
-    float			a_float;
-    double			a_double;
-#ifdef HAVE_LONG_DOUBLE
-    long double			a_longdouble;
-#endif
-    int				a_char;
-#ifdef HAVE_WINT_T
-    wint_t			a_wide_char;
-#endif
-    const char*			a_string;
-#ifdef HAVE_WCHAR_T
-    const wchar_t*		a_wide_string;
-#endif
-    void*			a_pointer;
-    signed char *		a_count_schar_pointer;
-    short *			a_count_short_pointer;
-    int *			a_count_int_pointer;
-    long int *			a_count_longint_pointer;
-#ifdef HAVE_LONG_LONG_INT
-    long long int *		a_count_longlongint_pointer;
-#endif
-  }
-  a;
-}
-argument;
-
-typedef struct
-{
-  size_t count;
-  argument *arg;
-}
-arguments;
-
-
-/* Fetch the arguments, putting them into a. */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int printf_fetchargs (va_list args, arguments *a);
-
-#endif /* _PRINTF_ARGS_H */
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
deleted file mode 100644
index 1a06b1a90..000000000
--- a/intl/printf-parse.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#include <config.h>
-
-/* Specification.  */
-#if WIDE_CHAR_VERSION
-# include "wprintf-parse.h"
-#else
-# include "printf-parse.h"
-#endif
-
-/* Get size_t, NULL.  */
-#include <stddef.h>
-
-/* Get intmax_t.  */
-#if HAVE_STDINT_H_WITH_UINTMAX
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-# include <inttypes.h>
-#endif
-
-/* malloc(), realloc(), free().  */
-#include <stdlib.h>
-
-/* Checked size_t computations.  */
-#include "xsize.h"
-
-#if WIDE_CHAR_VERSION
-# define PRINTF_PARSE wprintf_parse
-# define CHAR_T wchar_t
-# define DIRECTIVE wchar_t_directive
-# define DIRECTIVES wchar_t_directives
-#else
-# define PRINTF_PARSE printf_parse
-# define CHAR_T char
-# define DIRECTIVE char_directive
-# define DIRECTIVES char_directives
-#endif
-
-#ifdef STATIC
-STATIC
-#endif
-int
-PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
-{
-  const CHAR_T *cp = format;		/* pointer into format */
-  size_t arg_posn = 0;		/* number of regular arguments consumed */
-  size_t d_allocated;			/* allocated elements of d->dir */
-  size_t a_allocated;			/* allocated elements of a->arg */
-  size_t max_width_length = 0;
-  size_t max_precision_length = 0;
-
-  d->count = 0;
-  d_allocated = 1;
-  d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
-  if (d->dir == NULL)
-    /* Out of memory.  */
-    return -1;
-
-  a->count = 0;
-  a_allocated = 0;
-  a->arg = NULL;
-
-#define REGISTER_ARG(_index_,_type_) \
-  {									\
-    size_t n = (_index_);						\
-    if (n >= a_allocated)						\
-      {									\
-	size_t memory_size;						\
-	argument *memory;						\
-									\
-	a_allocated = xtimes (a_allocated, 2);				\
-	if (a_allocated <= n)						\
-	  a_allocated = xsum (n, 1);					\
-	memory_size = xtimes (a_allocated, sizeof (argument));		\
-	if (size_overflow_p (memory_size))				\
-	  /* Overflow, would lead to out of memory.  */			\
-	  goto error;							\
-	memory = (a->arg						\
-		  ? realloc (a->arg, memory_size)			\
-		  : malloc (memory_size));				\
-	if (memory == NULL)						\
-	  /* Out of memory.  */						\
-	  goto error;							\
-	a->arg = memory;						\
-      }									\
-    while (a->count <= n)						\
-      a->arg[a->count++].type = TYPE_NONE;				\
-    if (a->arg[n].type == TYPE_NONE)					\
-      a->arg[n].type = (_type_);					\
-    else if (a->arg[n].type != (_type_))				\
-      /* Ambiguous type for positional argument.  */			\
-      goto error;							\
-  }
-
-  while (*cp != '\0')
-    {
-      CHAR_T c = *cp++;
-      if (c == '%')
-	{
-	  size_t arg_index = ARG_NONE;
-	  DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
-
-	  /* Initialize the next directive.  */
-	  dp->dir_start = cp - 1;
-	  dp->flags = 0;
-	  dp->width_start = NULL;
-	  dp->width_end = NULL;
-	  dp->width_arg_index = ARG_NONE;
-	  dp->precision_start = NULL;
-	  dp->precision_end = NULL;
-	  dp->precision_arg_index = ARG_NONE;
-	  dp->arg_index = ARG_NONE;
-
-	  /* Test for positional argument.  */
-	  if (*cp >= '0' && *cp <= '9')
-	    {
-	      const CHAR_T *np;
-
-	      for (np = cp; *np >= '0' && *np <= '9'; np++)
-		;
-	      if (*np == '$')
-		{
-		  size_t n = 0;
-
-		  for (np = cp; *np >= '0' && *np <= '9'; np++)
-		    n = xsum (xtimes (n, 10), *np - '0');
-		  if (n == 0)
-		    /* Positional argument 0.  */
-		    goto error;
-		  if (size_overflow_p (n))
-		    /* n too large, would lead to out of memory later.  */
-		    goto error;
-		  arg_index = n - 1;
-		  cp = np + 1;
-		}
-	    }
-
-	  /* Read the flags.  */
-	  for (;;)
-	    {
-	      if (*cp == '\'')
-		{
-		  dp->flags |= FLAG_GROUP;
-		  cp++;
-		}
-	      else if (*cp == '-')
-		{
-		  dp->flags |= FLAG_LEFT;
-		  cp++;
-		}
-	      else if (*cp == '+')
-		{
-		  dp->flags |= FLAG_SHOWSIGN;
-		  cp++;
-		}
-	      else if (*cp == ' ')
-		{
-		  dp->flags |= FLAG_SPACE;
-		  cp++;
-		}
-	      else if (*cp == '#')
-		{
-		  dp->flags |= FLAG_ALT;
-		  cp++;
-		}
-	      else if (*cp == '0')
-		{
-		  dp->flags |= FLAG_ZERO;
-		  cp++;
-		}
-	      else
-		break;
-	    }
-
-	  /* Parse the field width.  */
-	  if (*cp == '*')
-	    {
-	      dp->width_start = cp;
-	      cp++;
-	      dp->width_end = cp;
-	      if (max_width_length < 1)
-		max_width_length = 1;
-
-	      /* Test for positional argument.  */
-	      if (*cp >= '0' && *cp <= '9')
-		{
-		  const CHAR_T *np;
-
-		  for (np = cp; *np >= '0' && *np <= '9'; np++)
-		    ;
-		  if (*np == '$')
-		    {
-		      size_t n = 0;
-
-		      for (np = cp; *np >= '0' && *np <= '9'; np++)
-			n = xsum (xtimes (n, 10), *np - '0');
-		      if (n == 0)
-			/* Positional argument 0.  */
-			goto error;
-		      if (size_overflow_p (n))
-			/* n too large, would lead to out of memory later.  */
-			goto error;
-		      dp->width_arg_index = n - 1;
-		      cp = np + 1;
-		    }
-		}
-	      if (dp->width_arg_index == ARG_NONE)
-		{
-		  dp->width_arg_index = arg_posn++;
-		  if (dp->width_arg_index == ARG_NONE)
-		    /* arg_posn wrapped around.  */
-		    goto error;
-		}
-	      REGISTER_ARG (dp->width_arg_index, TYPE_INT);
-	    }
-	  else if (*cp >= '0' && *cp <= '9')
-	    {
-	      size_t width_length;
-
-	      dp->width_start = cp;
-	      for (; *cp >= '0' && *cp <= '9'; cp++)
-		;
-	      dp->width_end = cp;
-	      width_length = dp->width_end - dp->width_start;
-	      if (max_width_length < width_length)
-		max_width_length = width_length;
-	    }
-
-	  /* Parse the precision.  */
-	  if (*cp == '.')
-	    {
-	      cp++;
-	      if (*cp == '*')
-		{
-		  dp->precision_start = cp - 1;
-		  cp++;
-		  dp->precision_end = cp;
-		  if (max_precision_length < 2)
-		    max_precision_length = 2;
-
-		  /* Test for positional argument.  */
-		  if (*cp >= '0' && *cp <= '9')
-		    {
-		      const CHAR_T *np;
-
-		      for (np = cp; *np >= '0' && *np <= '9'; np++)
-			;
-		      if (*np == '$')
-			{
-			  size_t n = 0;
-
-			  for (np = cp; *np >= '0' && *np <= '9'; np++)
-			    n = xsum (xtimes (n, 10), *np - '0');
-			  if (n == 0)
-			    /* Positional argument 0.  */
-			    goto error;
-			  if (size_overflow_p (n))
-			    /* n too large, would lead to out of memory
-			       later.  */
-			    goto error;
-			  dp->precision_arg_index = n - 1;
-			  cp = np + 1;
-			}
-		    }
-		  if (dp->precision_arg_index == ARG_NONE)
-		    {
-		      dp->precision_arg_index = arg_posn++;
-		      if (dp->precision_arg_index == ARG_NONE)
-			/* arg_posn wrapped around.  */
-			goto error;
-		    }
-		  REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
-		}
-	      else
-		{
-		  size_t precision_length;
-
-		  dp->precision_start = cp - 1;
-		  for (; *cp >= '0' && *cp <= '9'; cp++)
-		    ;
-		  dp->precision_end = cp;
-		  precision_length = dp->precision_end - dp->precision_start;
-		  if (max_precision_length < precision_length)
-		    max_precision_length = precision_length;
-		}
-	    }
-
-	  {
-	    arg_type type;
-
-	    /* Parse argument type/size specifiers.  */
-	    {
-	      int flags = 0;
-
-	      for (;;)
-		{
-		  if (*cp == 'h')
-		    {
-		      flags |= (1 << (flags & 1));
-		      cp++;
-		    }
-		  else if (*cp == 'L')
-		    {
-		      flags |= 4;
-		      cp++;
-		    }
-		  else if (*cp == 'l')
-		    {
-		      flags += 8;
-		      cp++;
-		    }
-#ifdef HAVE_INTMAX_T
-		  else if (*cp == 'j')
-		    {
-		      if (sizeof (intmax_t) > sizeof (long))
-			{
-			  /* intmax_t = long long */
-			  flags += 16;
-			}
-		      else if (sizeof (intmax_t) > sizeof (int))
-			{
-			  /* intmax_t = long */
-			  flags += 8;
-			}
-		      cp++;
-		    }
-#endif
-		  else if (*cp == 'z' || *cp == 'Z')
-		    {
-		      /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
-			 because the warning facility in gcc-2.95.2 understands
-			 only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
-		      if (sizeof (size_t) > sizeof (long))
-			{
-			  /* size_t = long long */
-			  flags += 16;
-			}
-		      else if (sizeof (size_t) > sizeof (int))
-			{
-			  /* size_t = long */
-			  flags += 8;
-			}
-		      cp++;
-		    }
-		  else if (*cp == 't')
-		    {
-		      if (sizeof (ptrdiff_t) > sizeof (long))
-			{
-			  /* ptrdiff_t = long long */
-			  flags += 16;
-			}
-		      else if (sizeof (ptrdiff_t) > sizeof (int))
-			{
-			  /* ptrdiff_t = long */
-			  flags += 8;
-			}
-		      cp++;
-		    }
-		  else
-		    break;
-		}
-
-	      /* Read the conversion character.  */
-	      c = *cp++;
-	      switch (c)
-		{
-		case 'd': case 'i':
-#ifdef HAVE_LONG_LONG_INT
-		  /* If 'long long' exists and is larger than 'long':  */
-		  if (flags >= 16 || (flags & 4))
-		    type = TYPE_LONGLONGINT;
-		  else
-#endif
-		  /* If 'long long' exists and is the same as 'long', we parse
-		     "lld" into TYPE_LONGINT.  */
-		  if (flags >= 8)
-		    type = TYPE_LONGINT;
-		  else if (flags & 2)
-		    type = TYPE_SCHAR;
-		  else if (flags & 1)
-		    type = TYPE_SHORT;
-		  else
-		    type = TYPE_INT;
-		  break;
-		case 'o': case 'u': case 'x': case 'X':
-#ifdef HAVE_LONG_LONG_INT
-		  /* If 'long long' exists and is larger than 'long':  */
-		  if (flags >= 16 || (flags & 4))
-		    type = TYPE_ULONGLONGINT;
-		  else
-#endif
-		  /* If 'unsigned long long' exists and is the same as
-		     'unsigned long', we parse "llu" into TYPE_ULONGINT.  */
-		  if (flags >= 8)
-		    type = TYPE_ULONGINT;
-		  else if (flags & 2)
-		    type = TYPE_UCHAR;
-		  else if (flags & 1)
-		    type = TYPE_USHORT;
-		  else
-		    type = TYPE_UINT;
-		  break;
-		case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
-		case 'a': case 'A':
-#ifdef HAVE_LONG_DOUBLE
-		  if (flags >= 16 || (flags & 4))
-		    type = TYPE_LONGDOUBLE;
-		  else
-#endif
-		  type = TYPE_DOUBLE;
-		  break;
-		case 'c':
-		  if (flags >= 8)
-#ifdef HAVE_WINT_T
-		    type = TYPE_WIDE_CHAR;
-#else
-		    goto error;
-#endif
-		  else
-		    type = TYPE_CHAR;
-		  break;
-#ifdef HAVE_WINT_T
-		case 'C':
-		  type = TYPE_WIDE_CHAR;
-		  c = 'c';
-		  break;
-#endif
-		case 's':
-		  if (flags >= 8)
-#ifdef HAVE_WCHAR_T
-		    type = TYPE_WIDE_STRING;
-#else
-		    goto error;
-#endif
-		  else
-		    type = TYPE_STRING;
-		  break;
-#ifdef HAVE_WCHAR_T
-		case 'S':
-		  type = TYPE_WIDE_STRING;
-		  c = 's';
-		  break;
-#endif
-		case 'p':
-		  type = TYPE_POINTER;
-		  break;
-		case 'n':
-#ifdef HAVE_LONG_LONG_INT
-		  /* If 'long long' exists and is larger than 'long':  */
-		  if (flags >= 16 || (flags & 4))
-		    type = TYPE_COUNT_LONGLONGINT_POINTER;
-		  else
-#endif
-		  /* If 'long long' exists and is the same as 'long', we parse
-		     "lln" into TYPE_COUNT_LONGINT_POINTER.  */
-		  if (flags >= 8)
-		    type = TYPE_COUNT_LONGINT_POINTER;
-		  else if (flags & 2)
-		    type = TYPE_COUNT_SCHAR_POINTER;
-		  else if (flags & 1)
-		    type = TYPE_COUNT_SHORT_POINTER;
-		  else
-		    type = TYPE_COUNT_INT_POINTER;
-		  break;
-		case '%':
-		  type = TYPE_NONE;
-		  break;
-		default:
-		  /* Unknown conversion character.  */
-		  goto error;
-		}
-	    }
-
-	    if (type != TYPE_NONE)
-	      {
-		dp->arg_index = arg_index;
-		if (dp->arg_index == ARG_NONE)
-		  {
-		    dp->arg_index = arg_posn++;
-		    if (dp->arg_index == ARG_NONE)
-		      /* arg_posn wrapped around.  */
-		      goto error;
-		  }
-		REGISTER_ARG (dp->arg_index, type);
-	      }
-	    dp->conversion = c;
-	    dp->dir_end = cp;
-	  }
-
-	  d->count++;
-	  if (d->count >= d_allocated)
-	    {
-	      size_t memory_size;
-	      DIRECTIVE *memory;
-
-	      d_allocated = xtimes (d_allocated, 2);
-	      memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
-	      if (size_overflow_p (memory_size))
-		/* Overflow, would lead to out of memory.  */
-		goto error;
-	      memory = realloc (d->dir, memory_size);
-	      if (memory == NULL)
-		/* Out of memory.  */
-		goto error;
-	      d->dir = memory;
-	    }
-	}
-    }
-  d->dir[d->count].dir_start = cp;
-
-  d->max_width_length = max_width_length;
-  d->max_precision_length = max_precision_length;
-  return 0;
-
-error:
-  if (a->arg)
-    free (a->arg);
-  if (d->dir)
-    free (d->dir);
-  return -1;
-}
-
-#undef DIRECTIVES
-#undef DIRECTIVE
-#undef CHAR_T
-#undef PRINTF_PARSE
diff --git a/intl/printf-parse.h b/intl/printf-parse.h
deleted file mode 100644
index e78533895..000000000
--- a/intl/printf-parse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Parse printf format string.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _PRINTF_PARSE_H
-#define _PRINTF_PARSE_H
-
-#include "printf-args.h"
-
-
-/* Flags */
-#define FLAG_GROUP	 1	/* ' flag */
-#define FLAG_LEFT	 2	/* - flag */
-#define FLAG_SHOWSIGN	 4	/* + flag */
-#define FLAG_SPACE	 8	/* space flag */
-#define FLAG_ALT	16	/* # flag */
-#define FLAG_ZERO	32
-
-/* arg_index value indicating that no argument is consumed.  */
-#define ARG_NONE	(~(size_t)0)
-
-/* A parsed directive.  */
-typedef struct
-{
-  const char* dir_start;
-  const char* dir_end;
-  int flags;
-  const char* width_start;
-  const char* width_end;
-  size_t width_arg_index;
-  const char* precision_start;
-  const char* precision_end;
-  size_t precision_arg_index;
-  char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
-  size_t arg_index;
-}
-char_directive;
-
-/* A parsed format string.  */
-typedef struct
-{
-  size_t count;
-  char_directive *dir;
-  size_t max_width_length;
-  size_t max_precision_length;
-}
-char_directives;
-
-
-/* Parses the format string.  Fills in the number N of directives, and fills
-   in directives[0], ..., directives[N-1], and sets directives[N].dir_start
-   to the end of the format string.  Also fills in the arg_type fields of the
-   arguments and the needed count of arguments.  */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int printf_parse (const char *format, char_directives *d, arguments *a);
-
-#endif /* _PRINTF_PARSE_H */
diff --git a/intl/printf.c b/intl/printf.c
deleted file mode 100644
index 004c66f78..000000000
--- a/intl/printf.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
-   Written by Bruno Haible <[email protected]>, 2003.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdio.h>
-
-#if !HAVE_POSIX_PRINTF
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
-/* When building a DLL, we must export some functions.  Note that because
-   the functions are only defined for binary backward compatibility, we
-   don't need to use __declspec(dllimport) in any case.  */
-#if defined _MSC_VER && BUILDING_DLL
-# define DLL_EXPORTED __declspec(dllexport)
-#else
-# define DLL_EXPORTED
-#endif
-
-#define STATIC static
-
-/* This needs to be consistent with libgnuintl.h.in.  */
-#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
-/* Don't break __attribute__((format(printf,M,N))).
-   This redefinition is only possible because the libc in NetBSD, Cygwin,
-   mingw does not have a function __printf__.  */
-# define libintl_printf __printf__
-#endif
-
-/* Define auxiliary functions declared in "printf-args.h".  */
-#include "printf-args.c"
-
-/* Define auxiliary functions declared in "printf-parse.h".  */
-#include "printf-parse.c"
-
-/* Define functions declared in "vasnprintf.h".  */
-#define vasnprintf libintl_vasnprintf
-#include "vasnprintf.c"
-#if 0 /* not needed */
-#define asnprintf libintl_asnprintf
-#include "asnprintf.c"
-#endif
-
-DLL_EXPORTED
-int
-libintl_vfprintf (FILE *stream, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return vfprintf (stream, format, args);
-  else
-    {
-      size_t length;
-      char *result = libintl_vasnprintf (NULL, &length, format, args);
-      int retval = -1;
-      if (result != NULL)
-	{
-	  size_t written = fwrite (result, 1, length, stream);
-	  free (result);
-	  if (written == length)
-	    {
-	      if (length > INT_MAX)
-		errno = EOVERFLOW;
-	      else
-		retval = length;
-	    }
-	}
-      return retval;
-    }
-}
-
-DLL_EXPORTED
-int
-libintl_fprintf (FILE *stream, const char *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vfprintf (stream, format, args);
-  va_end (args);
-  return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vprintf (const char *format, va_list args)
-{
-  return libintl_vfprintf (stdout, format, args);
-}
-
-DLL_EXPORTED
-int
-libintl_printf (const char *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vprintf (format, args);
-  va_end (args);
-  return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vsprintf (char *resultbuf, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return vsprintf (resultbuf, format, args);
-  else
-    {
-      size_t length = (size_t) ~0 / (4 * sizeof (char));
-      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-      if (result != resultbuf)
-	{
-	  free (result);
-	  return -1;
-	}
-      if (length > INT_MAX)
-	{
-	  errno = EOVERFLOW;
-	  return -1;
-	}
-      else
-	return length;
-    }
-}
-
-DLL_EXPORTED
-int
-libintl_sprintf (char *resultbuf, const char *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vsprintf (resultbuf, format, args);
-  va_end (args);
-  return retval;
-}
-
-#if HAVE_SNPRINTF
-
-# if HAVE_DECL__SNPRINTF
-   /* Windows.  */
-#  define system_vsnprintf _vsnprintf
-# else
-   /* Unix.  */
-#  define system_vsnprintf vsnprintf
-# endif
-
-DLL_EXPORTED
-int
-libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return system_vsnprintf (resultbuf, length, format, args);
-  else
-    {
-      size_t maxlength = length;
-      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-      if (result != resultbuf)
-	{
-	  if (maxlength > 0)
-	    {
-	      size_t pruned_length =
-		(length < maxlength ? length : maxlength - 1);
-	      memcpy (resultbuf, result, pruned_length);
-	      resultbuf[pruned_length] = '\0';
-	    }
-	  free (result);
-	}
-      if (length > INT_MAX)
-	{
-	  errno = EOVERFLOW;
-	  return -1;
-	}
-      else
-	return length;
-    }
-}
-
-DLL_EXPORTED
-int
-libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vsnprintf (resultbuf, length, format, args);
-  va_end (args);
-  return retval;
-}
-
-#endif
-
-#if HAVE_ASPRINTF
-
-DLL_EXPORTED
-int
-libintl_vasprintf (char **resultp, const char *format, va_list args)
-{
-  size_t length;
-  char *result = libintl_vasnprintf (NULL, &length, format, args);
-  if (result == NULL)
-    return -1;
-  if (length > INT_MAX)
-    {
-      free (result);
-      errno = EOVERFLOW;
-      return -1;
-    }
-  *resultp = result;
-  return length;
-}
-
-DLL_EXPORTED
-int
-libintl_asprintf (char **resultp, const char *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vasprintf (resultp, format, args);
-  va_end (args);
-  return retval;
-}
-
-#endif
-
-#if HAVE_FWPRINTF
-
-#include <wchar.h>
-
-#define WIDE_CHAR_VERSION 1
-
-/* Define auxiliary functions declared in "wprintf-parse.h".  */
-#include "printf-parse.c"
-
-/* Define functions declared in "vasnprintf.h".  */
-#define vasnwprintf libintl_vasnwprintf
-#include "vasnprintf.c"
-#if 0 /* not needed */
-#define asnwprintf libintl_asnwprintf
-#include "asnprintf.c"
-#endif
-
-# if HAVE_DECL__SNWPRINTF
-   /* Windows.  */
-#  define system_vswprintf _vsnwprintf
-# else
-   /* Unix.  */
-#  define system_vswprintf vswprintf
-# endif
-
-DLL_EXPORTED
-int
-libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
-{
-  if (wcschr (format, '$') == NULL)
-    return vfwprintf (stream, format, args);
-  else
-    {
-      size_t length;
-      wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
-      int retval = -1;
-      if (result != NULL)
-	{
-	  size_t i;
-	  for (i = 0; i < length; i++)
-	    if (fputwc (result[i], stream) == WEOF)
-	      break;
-	  free (result);
-	  if (i == length)
-	    {
-	      if (length > INT_MAX)
-		errno = EOVERFLOW;
-	      else
-		retval = length;
-	    }
-	}
-      return retval;
-    }
-}
-
-DLL_EXPORTED
-int
-libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vfwprintf (stream, format, args);
-  va_end (args);
-  return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vwprintf (const wchar_t *format, va_list args)
-{
-  return libintl_vfwprintf (stdout, format, args);
-}
-
-DLL_EXPORTED
-int
-libintl_wprintf (const wchar_t *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vwprintf (format, args);
-  va_end (args);
-  return retval;
-}
-
-DLL_EXPORTED
-int
-libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
-{
-  if (wcschr (format, '$') == NULL)
-    return system_vswprintf (resultbuf, length, format, args);
-  else
-    {
-      size_t maxlength = length;
-      wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
-      if (result != resultbuf)
-	{
-	  if (maxlength > 0)
-	    {
-	      size_t pruned_length =
-		(length < maxlength ? length : maxlength - 1);
-	      memcpy (resultbuf, result, pruned_length * sizeof (wchar_t));
-	      resultbuf[pruned_length] = 0;
-	    }
-	  free (result);
-	  /* Unlike vsnprintf, which has to return the number of character that
-	     would have been produced if the resultbuf had been sufficiently
-	     large, the vswprintf function has to return a negative value if
-	     the resultbuf was not sufficiently large.  */
-	  if (length >= maxlength)
-	    return -1;
-	}
-      if (length > INT_MAX)
-	{
-	  errno = EOVERFLOW;
-	  return -1;
-	}
-      else
-	return length;
-    }
-}
-
-DLL_EXPORTED
-int
-libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
-{
-  va_list args;
-  int retval;
-
-  va_start (args, format);
-  retval = libintl_vswprintf (resultbuf, length, format, args);
-  va_end (args);
-  return retval;
-}
-
-#endif
-
-#endif
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
deleted file mode 100644
index 3678c2892..000000000
--- a/intl/ref-add.sin
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# Written by Bruno Haible <[email protected]>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  ta
-  :a
-  s/ @PACKAGE@ / @PACKAGE@ /
-  tb
-  s/ $/ @PACKAGE@ /
-  :b
-  s/^/# Packages using this file:/
-}
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
deleted file mode 100644
index 0c12d8e95..000000000
--- a/intl/ref-del.sin
+++ /dev/null
@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library 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.
-#
-# Written by Bruno Haible <[email protected]>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  s/ @PACKAGE@ / /
-  s/^/# Packages using this file:/
-}
diff --git a/intl/relocatable.c b/intl/relocatable.c
deleted file mode 100644
index 5e1dde6c8..000000000
--- a/intl/relocatable.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/* Provide relocatable packages.
-   Copyright (C) 2003-2006 Free Software Foundation, Inc.
-   Written by Bruno Haible <[email protected]>, 2003.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-
-/* Tell glibc's <stdio.h> to provide a prototype for getline().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#include <config.h>
-
-/* Specification.  */
-#include "relocatable.h"
-
-#if ENABLE_RELOCATABLE
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef NO_XMALLOC
-# define xmalloc malloc
-#else
-# include "xalloc.h"
-#endif
-
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#if DEPENDS_ON_LIBCHARSET
-# include <libcharset.h>
-#endif
-#if DEPENDS_ON_LIBICONV && HAVE_ICONV
-# include <iconv.h>
-#endif
-#if DEPENDS_ON_LIBINTL && ENABLE_NLS
-# include <libintl.h>
-#endif
-
-/* Faked cheap 'bool'.  */
-#undef bool
-#undef false
-#undef true
-#define bool int
-#define false 0
-#define true 1
-
-/* Pathname support.
-   ISSLASH(C)           tests whether C is a directory separator character.
-   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
-    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
-     && (P)[1] == ':')
-# define IS_PATH_WITH_DIR(P) \
-    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
-#else
-  /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-# define FILE_SYSTEM_PREFIX_LEN(P) 0
-#endif
-
-/* Original installation prefix.  */
-static char *orig_prefix;
-static size_t orig_prefix_len;
-/* Current installation prefix.  */
-static char *curr_prefix;
-static size_t curr_prefix_len;
-/* These prefixes do not end in a slash.  Anything that will be concatenated
-   to them must start with a slash.  */
-
-/* Sets the original and the current installation prefix of this module.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-static void
-set_this_relocation_prefix (const char *orig_prefix_arg,
-			    const char *curr_prefix_arg)
-{
-  if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
-      /* Optimization: if orig_prefix and curr_prefix are equal, the
-	 relocation is a nop.  */
-      && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
-    {
-      /* Duplicate the argument strings.  */
-      char *memory;
-
-      orig_prefix_len = strlen (orig_prefix_arg);
-      curr_prefix_len = strlen (curr_prefix_arg);
-      memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
-#ifdef NO_XMALLOC
-      if (memory != NULL)
-#endif
-	{
-	  memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
-	  orig_prefix = memory;
-	  memory += orig_prefix_len + 1;
-	  memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
-	  curr_prefix = memory;
-	  return;
-	}
-    }
-  orig_prefix = NULL;
-  curr_prefix = NULL;
-  /* Don't worry about wasted memory here - this function is usually only
-     called once.  */
-}
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-void
-set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
-{
-  set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-
-  /* Now notify all dependent libraries.  */
-#if DEPENDS_ON_LIBCHARSET
-  libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
-  libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
-  libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
-#endif
-}
-
-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
-
-/* Convenience function:
-   Computes the current installation prefix, based on the original
-   installation prefix, the original installation directory of a particular
-   file, and the current pathname of this file.  Returns NULL upon failure.  */
-#ifdef IN_LIBRARY
-#define compute_curr_prefix local_compute_curr_prefix
-static
-#endif
-const char *
-compute_curr_prefix (const char *orig_installprefix,
-		     const char *orig_installdir,
-		     const char *curr_pathname)
-{
-  const char *curr_installdir;
-  const char *rel_installdir;
-
-  if (curr_pathname == NULL)
-    return NULL;
-
-  /* Determine the relative installation directory, relative to the prefix.
-     This is simply the difference between orig_installprefix and
-     orig_installdir.  */
-  if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
-      != 0)
-    /* Shouldn't happen - nothing should be installed outside $(prefix).  */
-    return NULL;
-  rel_installdir = orig_installdir + strlen (orig_installprefix);
-
-  /* Determine the current installation directory.  */
-  {
-    const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
-    const char *p = curr_pathname + strlen (curr_pathname);
-    char *q;
-
-    while (p > p_base)
-      {
-	p--;
-	if (ISSLASH (*p))
-	  break;
-      }
-
-    q = (char *) xmalloc (p - curr_pathname + 1);
-#ifdef NO_XMALLOC
-    if (q == NULL)
-      return NULL;
-#endif
-    memcpy (q, curr_pathname, p - curr_pathname);
-    q[p - curr_pathname] = '\0';
-    curr_installdir = q;
-  }
-
-  /* Compute the current installation prefix by removing the trailing
-     rel_installdir from it.  */
-  {
-    const char *rp = rel_installdir + strlen (rel_installdir);
-    const char *cp = curr_installdir + strlen (curr_installdir);
-    const char *cp_base =
-      curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
-
-    while (rp > rel_installdir && cp > cp_base)
-      {
-	bool same = false;
-	const char *rpi = rp;
-	const char *cpi = cp;
-
-	while (rpi > rel_installdir && cpi > cp_base)
-	  {
-	    rpi--;
-	    cpi--;
-	    if (ISSLASH (*rpi) || ISSLASH (*cpi))
-	      {
-		if (ISSLASH (*rpi) && ISSLASH (*cpi))
-		  same = true;
-		break;
-	      }
-	    /* Do case-insensitive comparison if the filesystem is always or
-	       often case-insensitive.  It's better to accept the comparison
-	       if the difference is only in case, rather than to fail.  */
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-	    /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
-	    if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
-		!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
-	      break;
-#else
-	    if (*rpi != *cpi)
-	      break;
-#endif
-	  }
-	if (!same)
-	  break;
-	/* The last pathname component was the same.  opi and cpi now point
-	   to the slash before it.  */
-	rp = rpi;
-	cp = cpi;
-      }
-
-    if (rp > rel_installdir)
-      /* Unexpected: The curr_installdir does not end with rel_installdir.  */
-      return NULL;
-
-    {
-      size_t curr_prefix_len = cp - curr_installdir;
-      char *curr_prefix;
-
-      curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
-#ifdef NO_XMALLOC
-      if (curr_prefix == NULL)
-	return NULL;
-#endif
-      memcpy (curr_prefix, curr_installdir, curr_prefix_len);
-      curr_prefix[curr_prefix_len] = '\0';
-
-      return curr_prefix;
-    }
-  }
-}
-
-#endif /* !IN_LIBRARY || PIC */
-
-#if defined PIC && defined INSTALLDIR
-
-/* Full pathname of shared library, or NULL.  */
-static char *shared_library_fullname;
-
-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-
-/* Determine the full pathname of the shared library when it is loaded.  */
-
-BOOL WINAPI
-DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
-{
-  (void) reserved;
-
-  if (event == DLL_PROCESS_ATTACH)
-    {
-      /* The DLL is being loaded into an application's address range.  */
-      static char location[MAX_PATH];
-
-      if (!GetModuleFileName (module_handle, location, sizeof (location)))
-	/* Shouldn't happen.  */
-	return FALSE;
-
-      if (!IS_PATH_WITH_DIR (location))
-	/* Shouldn't happen.  */
-	return FALSE;
-
-      {
-#if defined __CYGWIN__
-	/* On Cygwin, we need to convert paths coming from Win32 system calls
-	   to the Unix-like slashified notation.  */
-	static char location_as_posix_path[2 * MAX_PATH];
-	/* There's no error return defined for cygwin_conv_to_posix_path.
-	   See cygwin-api/func-cygwin-conv-to-posix-path.html.
-	   Does it overflow the buffer of expected size MAX_PATH or does it
-	   truncate the path?  I don't know.  Let's catch both.  */
-	cygwin_conv_to_posix_path (location, location_as_posix_path);
-	location_as_posix_path[MAX_PATH - 1] = '\0';
-	if (strlen (location_as_posix_path) >= MAX_PATH - 1)
-	  /* A sign of buffer overflow or path truncation.  */
-	  return FALSE;
-	shared_library_fullname = strdup (location_as_posix_path);
-#else
-	shared_library_fullname = strdup (location);
-#endif
-      }
-    }
-
-  return TRUE;
-}
-
-#else /* Unix except Cygwin */
-
-static void
-find_shared_library_fullname ()
-{
-#if defined __linux__ && __GLIBC__ >= 2
-  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
-  FILE *fp;
-
-  /* Open the current process' maps file.  It describes one VMA per line.  */
-  fp = fopen ("/proc/self/maps", "r");
-  if (fp)
-    {
-      unsigned long address = (unsigned long) &find_shared_library_fullname;
-      for (;;)
-	{
-	  unsigned long start, end;
-	  int c;
-
-	  if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
-	    break;
-	  if (address >= start && address <= end - 1)
-	    {
-	      /* Found it.  Now see if this line contains a filename.  */
-	      while (c = getc (fp), c != EOF && c != '\n' && c != '/')
-		continue;
-	      if (c == '/')
-		{
-		  size_t size;
-		  int len;
-
-		  ungetc (c, fp);
-		  shared_library_fullname = NULL; size = 0;
-		  len = getline (&shared_library_fullname, &size, fp);
-		  if (len >= 0)
-		    {
-		      /* Success: filled shared_library_fullname.  */
-		      if (len > 0 && shared_library_fullname[len - 1] == '\n')
-			shared_library_fullname[len - 1] = '\0';
-		    }
-		}
-	      break;
-	    }
-	  while (c = getc (fp), c != EOF && c != '\n')
-	    continue;
-	}
-      fclose (fp);
-    }
-#endif
-}
-
-#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
-
-/* Return the full pathname of the current shared library.
-   Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin and Woe32.  */
-static char *
-get_shared_library_fullname ()
-{
-#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
-  static bool tried_find_shared_library_fullname;
-  if (!tried_find_shared_library_fullname)
-    {
-      find_shared_library_fullname ();
-      tried_find_shared_library_fullname = true;
-    }
-#endif
-  return shared_library_fullname;
-}
-
-#endif /* PIC */
-
-/* Returns the pathname, relocated according to the current installation
-   directory.  */
-const char *
-relocate (const char *pathname)
-{
-#if defined PIC && defined INSTALLDIR
-  static int initialized;
-
-  /* Initialization code for a shared library.  */
-  if (!initialized)
-    {
-      /* At this point, orig_prefix and curr_prefix likely have already been
-	 set through the main program's set_program_name_and_installdir
-	 function.  This is sufficient in the case that the library has
-	 initially been installed in the same orig_prefix.  But we can do
-	 better, to also cover the cases that 1. it has been installed
-	 in a different prefix before being moved to orig_prefix and (later)
-	 to curr_prefix, 2. unlike the program, it has not moved away from
-	 orig_prefix.  */
-      const char *orig_installprefix = INSTALLPREFIX;
-      const char *orig_installdir = INSTALLDIR;
-      const char *curr_prefix_better;
-
-      curr_prefix_better =
-	compute_curr_prefix (orig_installprefix, orig_installdir,
-			     get_shared_library_fullname ());
-      if (curr_prefix_better == NULL)
-	curr_prefix_better = curr_prefix;
-
-      set_relocation_prefix (orig_installprefix, curr_prefix_better);
-
-      initialized = 1;
-    }
-#endif
-
-  /* Note: It is not necessary to perform case insensitive comparison here,
-     even for DOS-like filesystems, because the pathname argument was
-     typically created from the same Makefile variable as orig_prefix came
-     from.  */
-  if (orig_prefix != NULL && curr_prefix != NULL
-      && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
-    {
-      if (pathname[orig_prefix_len] == '\0')
-	/* pathname equals orig_prefix.  */
-	return curr_prefix;
-      if (ISSLASH (pathname[orig_prefix_len]))
-	{
-	  /* pathname starts with orig_prefix.  */
-	  const char *pathname_tail = &pathname[orig_prefix_len];
-	  char *result =
-	    (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
-
-#ifdef NO_XMALLOC
-	  if (result != NULL)
-#endif
-	    {
-	      memcpy (result, curr_prefix, curr_prefix_len);
-	      strcpy (result + curr_prefix_len, pathname_tail);
-	      return result;
-	    }
-	}
-    }
-  /* Nothing to relocate.  */
-  return pathname;
-}
-
-#endif
diff --git a/intl/relocatable.h b/intl/relocatable.h
deleted file mode 100644
index f6d38321a..000000000
--- a/intl/relocatable.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Provide relocatable packages.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-   Written by Bruno Haible <[email protected]>, 2003.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _RELOCATABLE_H
-#define _RELOCATABLE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This can be enabled through the configure --enable-relocatable option.  */
-#if ENABLE_RELOCATABLE
-
-/* When building a DLL, we must export some functions.  Note that because
-   this is a private .h file, we don't need to use __declspec(dllimport)
-   in any case.  */
-#if HAVE_VISIBILITY && BUILDING_DLL
-# define RELOCATABLE_DLL_EXPORTED __attribute__((__visibility__("default")))
-#elif defined _MSC_VER && BUILDING_DLL
-# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
-#else
-# define RELOCATABLE_DLL_EXPORTED
-#endif
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-extern RELOCATABLE_DLL_EXPORTED void
-       set_relocation_prefix (const char *orig_prefix,
-			      const char *curr_prefix);
-
-/* Returns the pathname, relocated according to the current installation
-   directory.  */
-extern const char * relocate (const char *pathname);
-
-/* Memory management: relocate() leaks memory, because it has to construct
-   a fresh pathname.  If this is a problem because your program calls
-   relocate() frequently, think about caching the result.  */
-
-/* Convenience function:
-   Computes the current installation prefix, based on the original
-   installation prefix, the original installation directory of a particular
-   file, and the current pathname of this file.  Returns NULL upon failure.  */
-extern const char * compute_curr_prefix (const char *orig_installprefix,
-					 const char *orig_installdir,
-					 const char *curr_pathname);
-
-#else
-
-/* By default, we use the hardwired pathnames.  */
-#define relocate(pathname) (pathname)
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RELOCATABLE_H */
diff --git a/intl/textdomain.c b/intl/textdomain.c
deleted file mode 100644
index c316460fd..000000000
--- a/intl/textdomain.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* Handle multi-threaded applications.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-# define gl_rwlock_define __libc_rwlock_define
-# define gl_rwlock_wrlock __libc_rwlock_wrlock
-# define gl_rwlock_unlock __libc_rwlock_unlock
-#else
-# include "lock.h"
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain libintl_nl_default_default_domain
-# define _nl_current_default_domain libintl_nl_current_default_domain
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[] attribute_hidden;
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain attribute_hidden;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN libintl_textdomain
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (const char *domainname)
-{
-  char *new_domain;
-  char *old_domain;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  gl_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
-#endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
-    }
-
-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
-
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  gl_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
deleted file mode 100644
index 8b073103b..000000000
--- a/intl/vasnprintf.c
+++ /dev/null
@@ -1,890 +0,0 @@
-/* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#include <config.h>
-#ifndef IN_LIBINTL
-# include <alloca.h>
-#endif
-
-/* Specification.  */
-#if WIDE_CHAR_VERSION
-# include "vasnwprintf.h"
-#else
-# include "vasnprintf.h"
-#endif
-
-#include <stdio.h>	/* snprintf(), sprintf() */
-#include <stdlib.h>	/* abort(), malloc(), realloc(), free() */
-#include <string.h>	/* memcpy(), strlen() */
-#include <errno.h>	/* errno */
-#include <limits.h>	/* CHAR_BIT */
-#include <float.h>	/* DBL_MAX_EXP, LDBL_MAX_EXP */
-#if WIDE_CHAR_VERSION
-# include "wprintf-parse.h"
-#else
-# include "printf-parse.h"
-#endif
-
-/* Checked size_t computations.  */
-#include "xsize.h"
-
-#ifdef HAVE_WCHAR_T
-# ifdef HAVE_WCSLEN
-#  define local_wcslen wcslen
-# else
-   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
-      a dependency towards this library, here is a local substitute.
-      Define this substitute only once, even if this file is included
-      twice in the same compilation unit.  */
-#  ifndef local_wcslen_defined
-#   define local_wcslen_defined 1
-static size_t
-local_wcslen (const wchar_t *s)
-{
-  const wchar_t *ptr;
-
-  for (ptr = s; *ptr != (wchar_t) 0; ptr++)
-    ;
-  return ptr - s;
-}
-#  endif
-# endif
-#endif
-
-#if WIDE_CHAR_VERSION
-# define VASNPRINTF vasnwprintf
-# define CHAR_T wchar_t
-# define DIRECTIVE wchar_t_directive
-# define DIRECTIVES wchar_t_directives
-# define PRINTF_PARSE wprintf_parse
-# define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
-   /* On Windows, the function swprintf() has a different signature than
-      on Unix; we use the _snwprintf() function instead.  */
-#  define SNPRINTF _snwprintf
-# else
-   /* Unix.  */
-#  define SNPRINTF swprintf
-# endif
-#else
-# define VASNPRINTF vasnprintf
-# define CHAR_T char
-# define DIRECTIVE char_directive
-# define DIRECTIVES char_directives
-# define PRINTF_PARSE printf_parse
-# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
-# if HAVE_DECL__SNPRINTF
-   /* Windows.  */
-#  define SNPRINTF _snprintf
-# else
-   /* Unix.  */
-#  define SNPRINTF snprintf
-# endif
-#endif
-
-CHAR_T *
-VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
-{
-  DIRECTIVES d;
-  arguments a;
-
-  if (PRINTF_PARSE (format, &d, &a) < 0)
-    {
-      errno = EINVAL;
-      return NULL;
-    }
-
-#define CLEANUP() \
-  free (d.dir);								\
-  if (a.arg)								\
-    free (a.arg);
-
-  if (printf_fetchargs (args, &a) < 0)
-    {
-      CLEANUP ();
-      errno = EINVAL;
-      return NULL;
-    }
-
-  {
-    size_t buf_neededlength;
-    CHAR_T *buf;
-    CHAR_T *buf_malloced;
-    const CHAR_T *cp;
-    size_t i;
-    DIRECTIVE *dp;
-    /* Output string accumulator.  */
-    CHAR_T *result;
-    size_t allocated;
-    size_t length;
-
-    /* Allocate a small buffer that will hold a directive passed to
-       sprintf or snprintf.  */
-    buf_neededlength =
-      xsum4 (7, d.max_width_length, d.max_precision_length, 6);
-#if HAVE_ALLOCA
-    if (buf_neededlength < 4000 / sizeof (CHAR_T))
-      {
-	buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
-	buf_malloced = NULL;
-      }
-    else
-#endif
-      {
-	size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
-	if (size_overflow_p (buf_memsize))
-	  goto out_of_memory_1;
-	buf = (CHAR_T *) malloc (buf_memsize);
-	if (buf == NULL)
-	  goto out_of_memory_1;
-	buf_malloced = buf;
-      }
-
-    if (resultbuf != NULL)
-      {
-	result = resultbuf;
-	allocated = *lengthp;
-      }
-    else
-      {
-	result = NULL;
-	allocated = 0;
-      }
-    length = 0;
-    /* Invariants:
-       result is either == resultbuf or == NULL or malloc-allocated.
-       If length > 0, then result != NULL.  */
-
-    /* Ensures that allocated >= needed.  Aborts through a jump to
-       out_of_memory if needed is SIZE_MAX or otherwise too big.  */
-#define ENSURE_ALLOCATION(needed) \
-    if ((needed) > allocated)						     \
-      {									     \
-	size_t memory_size;						     \
-	CHAR_T *memory;							     \
-									     \
-	allocated = (allocated > 0 ? xtimes (allocated, 2) : 12);	     \
-	if ((needed) > allocated)					     \
-	  allocated = (needed);						     \
-	memory_size = xtimes (allocated, sizeof (CHAR_T));		     \
-	if (size_overflow_p (memory_size))				     \
-	  goto out_of_memory;						     \
-	if (result == resultbuf || result == NULL)			     \
-	  memory = (CHAR_T *) malloc (memory_size);			     \
-	else								     \
-	  memory = (CHAR_T *) realloc (result, memory_size);		     \
-	if (memory == NULL)						     \
-	  goto out_of_memory;						     \
-	if (result == resultbuf && length > 0)				     \
-	  memcpy (memory, result, length * sizeof (CHAR_T));		     \
-	result = memory;						     \
-      }
-
-    for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
-      {
-	if (cp != dp->dir_start)
-	  {
-	    size_t n = dp->dir_start - cp;
-	    size_t augmented_length = xsum (length, n);
-
-	    ENSURE_ALLOCATION (augmented_length);
-	    memcpy (result + length, cp, n * sizeof (CHAR_T));
-	    length = augmented_length;
-	  }
-	if (i == d.count)
-	  break;
-
-	/* Execute a single directive.  */
-	if (dp->conversion == '%')
-	  {
-	    size_t augmented_length;
-
-	    if (!(dp->arg_index == ARG_NONE))
-	      abort ();
-	    augmented_length = xsum (length, 1);
-	    ENSURE_ALLOCATION (augmented_length);
-	    result[length] = '%';
-	    length = augmented_length;
-	  }
-	else
-	  {
-	    if (!(dp->arg_index != ARG_NONE))
-	      abort ();
-
-	    if (dp->conversion == 'n')
-	      {
-		switch (a.arg[dp->arg_index].type)
-		  {
-		  case TYPE_COUNT_SCHAR_POINTER:
-		    *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
-		    break;
-		  case TYPE_COUNT_SHORT_POINTER:
-		    *a.arg[dp->arg_index].a.a_count_short_pointer = length;
-		    break;
-		  case TYPE_COUNT_INT_POINTER:
-		    *a.arg[dp->arg_index].a.a_count_int_pointer = length;
-		    break;
-		  case TYPE_COUNT_LONGINT_POINTER:
-		    *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
-		    break;
-#ifdef HAVE_LONG_LONG_INT
-		  case TYPE_COUNT_LONGLONGINT_POINTER:
-		    *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
-		    break;
-#endif
-		  default:
-		    abort ();
-		  }
-	      }
-	    else
-	      {
-		arg_type type = a.arg[dp->arg_index].type;
-		CHAR_T *p;
-		unsigned int prefix_count;
-		int prefixes[2];
-#if !USE_SNPRINTF
-		size_t tmp_length;
-		CHAR_T tmpbuf[700];
-		CHAR_T *tmp;
-
-		/* Allocate a temporary buffer of sufficient size for calling
-		   sprintf.  */
-		{
-		  size_t width;
-		  size_t precision;
-
-		  width = 0;
-		  if (dp->width_start != dp->width_end)
-		    {
-		      if (dp->width_arg_index != ARG_NONE)
-			{
-			  int arg;
-
-			  if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
-			    abort ();
-			  arg = a.arg[dp->width_arg_index].a.a_int;
-			  width = (arg < 0 ? (unsigned int) (-arg) : arg);
-			}
-		      else
-			{
-			  const CHAR_T *digitp = dp->width_start;
-
-			  do
-			    width = xsum (xtimes (width, 10), *digitp++ - '0');
-			  while (digitp != dp->width_end);
-			}
-		    }
-
-		  precision = 6;
-		  if (dp->precision_start != dp->precision_end)
-		    {
-		      if (dp->precision_arg_index != ARG_NONE)
-			{
-			  int arg;
-
-			  if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
-			    abort ();
-			  arg = a.arg[dp->precision_arg_index].a.a_int;
-			  precision = (arg < 0 ? 0 : arg);
-			}
-		      else
-			{
-			  const CHAR_T *digitp = dp->precision_start + 1;
-
-			  precision = 0;
-			  while (digitp != dp->precision_end)
-			    precision = xsum (xtimes (precision, 10), *digitp++ - '0');
-			}
-		    }
-
-		  switch (dp->conversion)
-		    {
-
-		    case 'd': case 'i': case 'u':
-# ifdef HAVE_LONG_LONG_INT
-		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-					  * 0.30103 /* binary -> decimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-# endif
-		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-					  * 0.30103 /* binary -> decimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-					  * 0.30103 /* binary -> decimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      if (tmp_length < precision)
-			tmp_length = precision;
-		      /* Multiply by 2, as an estimate for FLAG_GROUP.  */
-		      tmp_length = xsum (tmp_length, tmp_length);
-		      /* Add 1, to account for a leading sign.  */
-		      tmp_length = xsum (tmp_length, 1);
-		      break;
-
-		    case 'o':
-# ifdef HAVE_LONG_LONG_INT
-		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-					  * 0.333334 /* binary -> octal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-# endif
-		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-					  * 0.333334 /* binary -> octal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-					  * 0.333334 /* binary -> octal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      if (tmp_length < precision)
-			tmp_length = precision;
-		      /* Add 1, to account for a leading sign.  */
-		      tmp_length = xsum (tmp_length, 1);
-		      break;
-
-		    case 'x': case 'X':
-# ifdef HAVE_LONG_LONG_INT
-		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-					  * 0.25 /* binary -> hexadecimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-# endif
-		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-					  * 0.25 /* binary -> hexadecimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      else
-			tmp_length =
-			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-					  * 0.25 /* binary -> hexadecimal */
-					 )
-			  + 1; /* turn floor into ceil */
-		      if (tmp_length < precision)
-			tmp_length = precision;
-		      /* Add 2, to account for a leading sign or alternate form.  */
-		      tmp_length = xsum (tmp_length, 2);
-		      break;
-
-		    case 'f': case 'F':
-# ifdef HAVE_LONG_DOUBLE
-		      if (type == TYPE_LONGDOUBLE)
-			tmp_length =
-			  (unsigned int) (LDBL_MAX_EXP
-					  * 0.30103 /* binary -> decimal */
-					  * 2 /* estimate for FLAG_GROUP */
-					 )
-			  + 1 /* turn floor into ceil */
-			  + 10; /* sign, decimal point etc. */
-		      else
-# endif
-			tmp_length =
-			  (unsigned int) (DBL_MAX_EXP
-					  * 0.30103 /* binary -> decimal */
-					  * 2 /* estimate for FLAG_GROUP */
-					 )
-			  + 1 /* turn floor into ceil */
-			  + 10; /* sign, decimal point etc. */
-		      tmp_length = xsum (tmp_length, precision);
-		      break;
-
-		    case 'e': case 'E': case 'g': case 'G':
-		    case 'a': case 'A':
-		      tmp_length =
-			12; /* sign, decimal point, exponent etc. */
-		      tmp_length = xsum (tmp_length, precision);
-		      break;
-
-		    case 'c':
-# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
-		      if (type == TYPE_WIDE_CHAR)
-			tmp_length = MB_CUR_MAX;
-		      else
-# endif
-			tmp_length = 1;
-		      break;
-
-		    case 's':
-# ifdef HAVE_WCHAR_T
-		      if (type == TYPE_WIDE_STRING)
-			{
-			  tmp_length =
-			    local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
-
-#  if !WIDE_CHAR_VERSION
-			  tmp_length = xtimes (tmp_length, MB_CUR_MAX);
-#  endif
-			}
-		      else
-# endif
-			tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
-		      break;
-
-		    case 'p':
-		      tmp_length =
-			(unsigned int) (sizeof (void *) * CHAR_BIT
-					* 0.25 /* binary -> hexadecimal */
-				       )
-			  + 1 /* turn floor into ceil */
-			  + 2; /* account for leading 0x */
-		      break;
-
-		    default:
-		      abort ();
-		    }
-
-		  if (tmp_length < width)
-		    tmp_length = width;
-
-		  tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
-		}
-
-		if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
-		  tmp = tmpbuf;
-		else
-		  {
-		    size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
-
-		    if (size_overflow_p (tmp_memsize))
-		      /* Overflow, would lead to out of memory.  */
-		      goto out_of_memory;
-		    tmp = (CHAR_T *) malloc (tmp_memsize);
-		    if (tmp == NULL)
-		      /* Out of memory.  */
-		      goto out_of_memory;
-		  }
-#endif
-
-		/* Construct the format string for calling snprintf or
-		   sprintf.  */
-		p = buf;
-		*p++ = '%';
-		if (dp->flags & FLAG_GROUP)
-		  *p++ = '\'';
-		if (dp->flags & FLAG_LEFT)
-		  *p++ = '-';
-		if (dp->flags & FLAG_SHOWSIGN)
-		  *p++ = '+';
-		if (dp->flags & FLAG_SPACE)
-		  *p++ = ' ';
-		if (dp->flags & FLAG_ALT)
-		  *p++ = '#';
-		if (dp->flags & FLAG_ZERO)
-		  *p++ = '0';
-		if (dp->width_start != dp->width_end)
-		  {
-		    size_t n = dp->width_end - dp->width_start;
-		    memcpy (p, dp->width_start, n * sizeof (CHAR_T));
-		    p += n;
-		  }
-		if (dp->precision_start != dp->precision_end)
-		  {
-		    size_t n = dp->precision_end - dp->precision_start;
-		    memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
-		    p += n;
-		  }
-
-		switch (type)
-		  {
-#ifdef HAVE_LONG_LONG_INT
-		  case TYPE_LONGLONGINT:
-		  case TYPE_ULONGLONGINT:
-		    *p++ = 'l';
-		    /*FALLTHROUGH*/
-#endif
-		  case TYPE_LONGINT:
-		  case TYPE_ULONGINT:
-#ifdef HAVE_WINT_T
-		  case TYPE_WIDE_CHAR:
-#endif
-#ifdef HAVE_WCHAR_T
-		  case TYPE_WIDE_STRING:
-#endif
-		    *p++ = 'l';
-		    break;
-#ifdef HAVE_LONG_DOUBLE
-		  case TYPE_LONGDOUBLE:
-		    *p++ = 'L';
-		    break;
-#endif
-		  default:
-		    break;
-		  }
-		*p = dp->conversion;
-#if USE_SNPRINTF
-		p[1] = '%';
-		p[2] = 'n';
-		p[3] = '\0';
-#else
-		p[1] = '\0';
-#endif
-
-		/* Construct the arguments for calling snprintf or sprintf.  */
-		prefix_count = 0;
-		if (dp->width_arg_index != ARG_NONE)
-		  {
-		    if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
-		      abort ();
-		    prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
-		  }
-		if (dp->precision_arg_index != ARG_NONE)
-		  {
-		    if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
-		      abort ();
-		    prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
-		  }
-
-#if USE_SNPRINTF
-		/* Prepare checking whether snprintf returns the count
-		   via %n.  */
-		ENSURE_ALLOCATION (xsum (length, 1));
-		result[length] = '\0';
-#endif
-
-		for (;;)
-		  {
-		    size_t maxlen;
-		    int count;
-		    int retcount;
-
-		    maxlen = allocated - length;
-		    count = -1;
-		    retcount = 0;
-
-#if USE_SNPRINTF
-# define SNPRINTF_BUF(arg) \
-		    switch (prefix_count)				    \
-		      {							    \
-		      case 0:						    \
-			retcount = SNPRINTF (result + length, maxlen, buf,  \
-					     arg, &count);		    \
-			break;						    \
-		      case 1:						    \
-			retcount = SNPRINTF (result + length, maxlen, buf,  \
-					     prefixes[0], arg, &count);	    \
-			break;						    \
-		      case 2:						    \
-			retcount = SNPRINTF (result + length, maxlen, buf,  \
-					     prefixes[0], prefixes[1], arg, \
-					     &count);			    \
-			break;						    \
-		      default:						    \
-			abort ();					    \
-		      }
-#else
-# define SNPRINTF_BUF(arg) \
-		    switch (prefix_count)				    \
-		      {							    \
-		      case 0:						    \
-			count = sprintf (tmp, buf, arg);		    \
-			break;						    \
-		      case 1:						    \
-			count = sprintf (tmp, buf, prefixes[0], arg);	    \
-			break;						    \
-		      case 2:						    \
-			count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
-					 arg);				    \
-			break;						    \
-		      default:						    \
-			abort ();					    \
-		      }
-#endif
-
-		    switch (type)
-		      {
-		      case TYPE_SCHAR:
-			{
-			  int arg = a.arg[dp->arg_index].a.a_schar;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_UCHAR:
-			{
-			  unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_SHORT:
-			{
-			  int arg = a.arg[dp->arg_index].a.a_short;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_USHORT:
-			{
-			  unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_INT:
-			{
-			  int arg = a.arg[dp->arg_index].a.a_int;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_UINT:
-			{
-			  unsigned int arg = a.arg[dp->arg_index].a.a_uint;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_LONGINT:
-			{
-			  long int arg = a.arg[dp->arg_index].a.a_longint;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_ULONGINT:
-			{
-			  unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#ifdef HAVE_LONG_LONG_INT
-		      case TYPE_LONGLONGINT:
-			{
-			  long long int arg = a.arg[dp->arg_index].a.a_longlongint;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      case TYPE_ULONGLONGINT:
-			{
-			  unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#endif
-		      case TYPE_DOUBLE:
-			{
-			  double arg = a.arg[dp->arg_index].a.a_double;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#ifdef HAVE_LONG_DOUBLE
-		      case TYPE_LONGDOUBLE:
-			{
-			  long double arg = a.arg[dp->arg_index].a.a_longdouble;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#endif
-		      case TYPE_CHAR:
-			{
-			  int arg = a.arg[dp->arg_index].a.a_char;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#ifdef HAVE_WINT_T
-		      case TYPE_WIDE_CHAR:
-			{
-			  wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#endif
-		      case TYPE_STRING:
-			{
-			  const char *arg = a.arg[dp->arg_index].a.a_string;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#ifdef HAVE_WCHAR_T
-		      case TYPE_WIDE_STRING:
-			{
-			  const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-#endif
-		      case TYPE_POINTER:
-			{
-			  void *arg = a.arg[dp->arg_index].a.a_pointer;
-			  SNPRINTF_BUF (arg);
-			}
-			break;
-		      default:
-			abort ();
-		      }
-
-#if USE_SNPRINTF
-		    /* Portability: Not all implementations of snprintf()
-		       are ISO C 99 compliant.  Determine the number of
-		       bytes that snprintf() has produced or would have
-		       produced.  */
-		    if (count >= 0)
-		      {
-			/* Verify that snprintf() has NUL-terminated its
-			   result.  */
-			if (count < maxlen && result[length + count] != '\0')
-			  abort ();
-			/* Portability hack.  */
-			if (retcount > count)
-			  count = retcount;
-		      }
-		    else
-		      {
-			/* snprintf() doesn't understand the '%n'
-			   directive.  */
-			if (p[1] != '\0')
-			  {
-			    /* Don't use the '%n' directive; instead, look
-			       at the snprintf() return value.  */
-			    p[1] = '\0';
-			    continue;
-			  }
-			else
-			  {
-			    /* Look at the snprintf() return value.  */
-			    if (retcount < 0)
-			      {
-				/* HP-UX 10.20 snprintf() is doubly deficient:
-				   It doesn't understand the '%n' directive,
-				   *and* it returns -1 (rather than the length
-				   that would have been required) when the
-				   buffer is too small.  */
-				size_t bigger_need =
-				  xsum (xtimes (allocated, 2), 12);
-				ENSURE_ALLOCATION (bigger_need);
-				continue;
-			      }
-			    else
-			      count = retcount;
-			  }
-		      }
-#endif
-
-		    /* Attempt to handle failure.  */
-		    if (count < 0)
-		      {
-			if (!(result == resultbuf || result == NULL))
-			  free (result);
-			if (buf_malloced != NULL)
-			  free (buf_malloced);
-			CLEANUP ();
-			errno = EINVAL;
-			return NULL;
-		      }
-
-#if !USE_SNPRINTF
-		    if (count >= tmp_length)
-		      /* tmp_length was incorrectly calculated - fix the
-			 code above!  */
-		      abort ();
-#endif
-
-		    /* Make room for the result.  */
-		    if (count >= maxlen)
-		      {
-			/* Need at least count bytes.  But allocate
-			   proportionally, to avoid looping eternally if
-			   snprintf() reports a too small count.  */
-			size_t n =
-			  xmax (xsum (length, count), xtimes (allocated, 2));
-
-			ENSURE_ALLOCATION (n);
-#if USE_SNPRINTF
-			continue;
-#endif
-		      }
-
-#if USE_SNPRINTF
-		    /* The snprintf() result did fit.  */
-#else
-		    /* Append the sprintf() result.  */
-		    memcpy (result + length, tmp, count * sizeof (CHAR_T));
-		    if (tmp != tmpbuf)
-		      free (tmp);
-#endif
-
-		    length += count;
-		    break;
-		  }
-	      }
-	  }
-      }
-
-    /* Add the final NUL.  */
-    ENSURE_ALLOCATION (xsum (length, 1));
-    result[length] = '\0';
-
-    if (result != resultbuf && length + 1 < allocated)
-      {
-	/* Shrink the allocated memory if possible.  */
-	CHAR_T *memory;
-
-	memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
-	if (memory != NULL)
-	  result = memory;
-      }
-
-    if (buf_malloced != NULL)
-      free (buf_malloced);
-    CLEANUP ();
-    *lengthp = length;
-    /* Note that we can produce a big string of a length > INT_MAX.  POSIX
-       says that snprintf() fails with errno = EOVERFLOW in this case, but
-       that's only because snprintf() returns an 'int'.  This function does
-       not have this limitation.  */
-    return result;
-
-  out_of_memory:
-    if (!(result == resultbuf || result == NULL))
-      free (result);
-    if (buf_malloced != NULL)
-      free (buf_malloced);
-  out_of_memory_1:
-    CLEANUP ();
-    errno = ENOMEM;
-    return NULL;
-  }
-}
-
-#undef SNPRINTF
-#undef USE_SNPRINTF
-#undef PRINTF_PARSE
-#undef DIRECTIVES
-#undef DIRECTIVE
-#undef CHAR_T
-#undef VASNPRINTF
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
deleted file mode 100644
index e67b88da3..000000000
--- a/intl/vasnprintf.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _VASNPRINTF_H
-#define _VASNPRINTF_H
-
-/* Get va_list.  */
-#include <stdarg.h>
-
-/* Get size_t.  */
-#include <stddef.h>
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* Write formatted output to a string dynamically allocated with malloc().
-   You can pass a preallocated buffer for the result in RESULTBUF and its
-   size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
-   If successful, return the address of the string (this may be = RESULTBUF
-   if no dynamic memory allocation was necessary) and set *LENGTHP to the
-   number of resulting bytes, excluding the trailing NUL.  Upon error, set
-   errno and return NULL.
-
-   When dynamic memory allocation occurs, the preallocated buffer is left
-   alone (with possibly modified contents).  This makes it possible to use
-   a statically allocated or stack-allocated buffer, like this:
-
-          char buf[100];
-          size_t len = sizeof (buf);
-          char *output = vasnprintf (buf, &len, format, args);
-          if (output == NULL)
-            ... error handling ...;
-          else
-            {
-              ... use the output string ...;
-              if (output != buf)
-                free (output);
-            }
-  */
-extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
-       __attribute__ ((__format__ (__printf__, 3, 4)));
-extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
-       __attribute__ ((__format__ (__printf__, 3, 0)));
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _VASNPRINTF_H */
diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
deleted file mode 100644
index 6ff03ce16..000000000
--- a/intl/vasnwprintf.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* vswprintf with automatic memory allocation.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _VASNWPRINTF_H
-#define _VASNWPRINTF_H
-
-/* Get va_list.  */
-#include <stdarg.h>
-
-/* Get wchar_t, size_t.  */
-#include <stddef.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* Write formatted output to a string dynamically allocated with malloc().
-   You can pass a preallocated buffer for the result in RESULTBUF and its
-   size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
-   If successful, return the address of the string (this may be = RESULTBUF
-   if no dynamic memory allocation was necessary) and set *LENGTHP to the
-   number of resulting bytes, excluding the trailing NUL.  Upon error, set
-   errno and return NULL.  */
-extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
-extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _VASNWPRINTF_H */
diff --git a/intl/version.c b/intl/version.c
deleted file mode 100644
index a968cf746..000000000
--- a/intl/version.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* libintl library version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgnuintl.h"
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-int libintl_version = LIBINTL_VERSION;
diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
deleted file mode 100644
index 600b89adc..000000000
--- a/intl/wprintf-parse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Parse printf format string.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _WPRINTF_PARSE_H
-#define _WPRINTF_PARSE_H
-
-#include "printf-args.h"
-
-
-/* Flags */
-#define FLAG_GROUP	 1	/* ' flag */
-#define FLAG_LEFT	 2	/* - flag */
-#define FLAG_SHOWSIGN	 4	/* + flag */
-#define FLAG_SPACE	 8	/* space flag */
-#define FLAG_ALT	16	/* # flag */
-#define FLAG_ZERO	32
-
-/* arg_index value indicating that no argument is consumed.  */
-#define ARG_NONE	(~(size_t)0)
-
-/* A parsed directive.  */
-typedef struct
-{
-  const wchar_t* dir_start;
-  const wchar_t* dir_end;
-  int flags;
-  const wchar_t* width_start;
-  const wchar_t* width_end;
-  size_t width_arg_index;
-  const wchar_t* precision_start;
-  const wchar_t* precision_end;
-  size_t precision_arg_index;
-  wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
-  size_t arg_index;
-}
-wchar_t_directive;
-
-/* A parsed format string.  */
-typedef struct
-{
-  size_t count;
-  wchar_t_directive *dir;
-  size_t max_width_length;
-  size_t max_precision_length;
-}
-wchar_t_directives;
-
-
-/* Parses the format string.  Fills in the number N of directives, and fills
-   in directives[0], ..., directives[N-1], and sets directives[N].dir_start
-   to the end of the format string.  Also fills in the arg_type fields of the
-   arguments and the needed count of arguments.  */
-#ifdef STATIC
-STATIC
-#else
-extern
-#endif
-int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
-
-#endif /* _WPRINTF_PARSE_H */
diff --git a/intl/xsize.h b/intl/xsize.h
deleted file mode 100644
index b3023a7d4..000000000
--- a/intl/xsize.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* xsize.h -- Checked size_t computations.
-
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _XSIZE_H
-#define _XSIZE_H
-
-/* Get size_t.  */
-#include <stddef.h>
-
-/* Get SIZE_MAX.  */
-#include <limits.h>
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-/* The size of memory objects is often computed through expressions of
-   type size_t. Example:
-      void* p = malloc (header_size + n * element_size).
-   These computations can lead to overflow.  When this happens, malloc()
-   returns a piece of memory that is way too small, and the program then
-   crashes while attempting to fill the memory.
-   To avoid this, the functions and macros in this file check for overflow.
-   The convention is that SIZE_MAX represents overflow.
-   malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
-   implementation that uses mmap --, it's recommended to use size_overflow_p()
-   or size_in_bounds_p() before invoking malloc().
-   The example thus becomes:
-      size_t size = xsum (header_size, xtimes (n, element_size));
-      void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
-*/
-
-/* Convert an arbitrary value >= 0 to type size_t.  */
-#define xcast_size_t(N) \
-  ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
-
-/* Sum of two sizes, with overflow check.  */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum (size_t size1, size_t size2)
-{
-  size_t sum = size1 + size2;
-  return (sum >= size1 ? sum : SIZE_MAX);
-}
-
-/* Sum of three sizes, with overflow check.  */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum3 (size_t size1, size_t size2, size_t size3)
-{
-  return xsum (xsum (size1, size2), size3);
-}
-
-/* Sum of four sizes, with overflow check.  */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
-{
-  return xsum (xsum (xsum (size1, size2), size3), size4);
-}
-
-/* Maximum of two sizes, with overflow check.  */
-static inline size_t
-#if __GNUC__ >= 3
-__attribute__ ((__pure__))
-#endif
-xmax (size_t size1, size_t size2)
-{
-  /* No explicit check is needed here, because for any n:
-     max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX.  */
-  return (size1 >= size2 ? size1 : size2);
-}
-
-/* Multiplication of a count with an element size, with overflow check.
-   The count must be >= 0 and the element size must be > 0.
-   This is a macro, not an inline function, so that it works correctly even
-   when N is of a wider tupe and N > SIZE_MAX.  */
-#define xtimes(N, ELSIZE) \
-  ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
-
-/* Check for overflow.  */
-#define size_overflow_p(SIZE) \
-  ((SIZE) == SIZE_MAX)
-/* Check against overflow.  */
-#define size_in_bounds_p(SIZE) \
-  ((SIZE) != SIZE_MAX)
-
-#endif /* _XSIZE_H */
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 37ae48ed9..947e7ebd6 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* utf8conv.c (load_libiconv): Remove URL from translatble string.
+
+	Switched JNLIB from LGPLv2.1 to LGPLv3.
+
 2007-07-01  Werner Koch  <[email protected]>
 
 	* argparse.c (strusage): Use id 10 for the license string;
diff --git a/jnlib/Makefile.am b/jnlib/Makefile.am
index eb447b592..9f79335b5 100644
--- a/jnlib/Makefile.am
+++ b/jnlib/Makefile.am
@@ -6,7 +6,7 @@
 # 
 # JNLIB is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
+# published by the Free Software Foundation; either version 3 of
 # the License, or (at your option) any later version.
 # 
 # JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
 # Lesser General Public License for more details.
 # 
 # You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 ## Process this file with automake to produce Makefile.in
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 54dd24e2d..78ff3a46d 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -924,8 +922,8 @@ strusage( int level )
 	return p;
 
     switch( level ) {
-      case 10: p = ("License GPLv2+: GNU GPL version 2 or later "
-                    "<http://gnu.org/licenses/old-licenses/gpl-2.0.html>");
+      case 10: p = ("License GPLv3+: GNU GPL version 3 or later "
+                    "<http://gnu.org/licenses/gpl.html>");
         break;
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
@@ -944,7 +942,7 @@ strusage( int level )
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "GNU General Public License for more details.\n\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this software.  If not, see  <http://www.gnu.org/licenses/>.\n";
+"along with this software.  If not, see <http://www.gnu.org/licenses/>.\n";
 	break;
       case 40: /* short and long usage */
       case 41: p = ""; break;
diff --git a/jnlib/argparse.h b/jnlib/argparse.h
index 3528d8156..7972438b8 100644
--- a/jnlib/argparse.h
+++ b/jnlib/argparse.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_ARGPARSE_H
diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c
index 53fb52655..079723ce9 100644
--- a/jnlib/dotlock.c
+++ b/jnlib/dotlock.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/dotlock.h b/jnlib/dotlock.h
index 054900522..b2a0190d2 100644
--- a/jnlib/dotlock.h
+++ b/jnlib/dotlock.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_DOTLOCK_H
diff --git a/jnlib/dynload.h b/jnlib/dynload.h
index e365d4f0d..a58bc19f9 100644
--- a/jnlib/dynload.h
+++ b/jnlib/dynload.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_DYNLOAD_H
diff --git a/jnlib/libjnlib-config.h b/jnlib/libjnlib-config.h
index 6c9408fdb..2738e99e6 100644
--- a/jnlib/libjnlib-config.h
+++ b/jnlib/libjnlib-config.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /****************
diff --git a/jnlib/logging.c b/jnlib/logging.c
index 0df4422b0..37ae207f3 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/jnlib/logging.h b/jnlib/logging.h
index ed54b473e..a54e2d50d 100644
--- a/jnlib/logging.h
+++ b/jnlib/logging.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_LOGGING_H
diff --git a/jnlib/mischelp.c b/jnlib/mischelp.c
index 7f8e671cd..b2248288e 100644
--- a/jnlib/mischelp.c
+++ b/jnlib/mischelp.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/mischelp.h b/jnlib/mischelp.h
index 7c07c3c3f..a00764106 100644
--- a/jnlib/mischelp.h
+++ b/jnlib/mischelp.h
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_MISCHELP_H
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 2050cddb3..c1c1e451b 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index 5f08745cb..6dee2e417 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_STRINGHELP_H
diff --git a/jnlib/strlist.c b/jnlib/strlist.c
index 01f483a8a..14506930b 100644
--- a/jnlib/strlist.c
+++ b/jnlib/strlist.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/strlist.h b/jnlib/strlist.h
index a5f1a082f..4191624ae 100644
--- a/jnlib/strlist.h
+++ b/jnlib/strlist.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_STRLIST_H
diff --git a/jnlib/t-stringhelp.c b/jnlib/t-stringhelp.c
index 27bea8940..89ba643bf 100644
--- a/jnlib/t-stringhelp.c
+++ b/jnlib/t-stringhelp.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/t-support.c b/jnlib/t-support.c
index d9d50e9a4..9b84634f8 100644
--- a/jnlib/t-support.c
+++ b/jnlib/t-support.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/t-support.h b/jnlib/t-support.h
index 661dfb46e..52701741b 100644
--- a/jnlib/t-support.h
+++ b/jnlib/t-support.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_T_SUPPORT_H
diff --git a/jnlib/types.h b/jnlib/types.h
index f8548b58a..3f64ba58d 100644
--- a/jnlib/types.h
+++ b/jnlib/types.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_TYPES_H
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c
index ac0f2e2e1..1b9c93dff 100644
--- a/jnlib/utf8conv.c
+++ b/jnlib/utf8conv.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -87,8 +85,8 @@ load_libiconv (void)
         {
           log_info (_("error loading `%s': %s\n"),
                      "iconv.dll",  dlerror ());
-          log_info (_("please see http://www.gnupg.org/download/iconv.html "
-                      "for more information\n"));
+          log_info (_("please see %s for more information\n"),
+                    "http://www.gnupg.org/download/iconv.html");
           iconv_open = NULL;
           iconv = NULL;
           iconv_close = NULL;
@@ -726,7 +724,7 @@ jnlib_iconv (jnlib_iconv_t cd,
     return 0;
 #endif /*HAVE_W32_SYSTEM*/      
 
-  return iconv ((iconv_t)cd, inbuf, inbytesleft, outbuf, outbytesleft);
+  return iconv ((iconv_t)cd, (char**)inbuf, inbytesleft, outbuf, outbytesleft);
 }
 
 /* Wrapper function for iconv_close, required for W32 as we dlopen that
diff --git a/jnlib/utf8conv.h b/jnlib/utf8conv.h
index 757920cac..e800f81da 100644
--- a/jnlib/utf8conv.h
+++ b/jnlib/utf8conv.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_UTF8CONF_H
diff --git a/jnlib/w32-afunix.c b/jnlib/w32-afunix.c
index 16132a230..f24c06482 100644
--- a/jnlib/w32-afunix.c
+++ b/jnlib/w32-afunix.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef _WIN32
diff --git a/jnlib/w32-afunix.h b/jnlib/w32-afunix.h
index d16e86557..ebb61d80e 100644
--- a/jnlib/w32-afunix.h
+++ b/jnlib/w32-afunix.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef _WIN32
diff --git a/jnlib/w32-gettext.c b/jnlib/w32-gettext.c
index eca1ee324..2af655be5 100644
--- a/jnlib/w32-gettext.c
+++ b/jnlib/w32-gettext.c
@@ -6,7 +6,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* 
diff --git a/jnlib/w32-reg.c b/jnlib/w32-reg.c
index b7a383e3f..e6bd911c5 100644
--- a/jnlib/w32-reg.c
+++ b/jnlib/w32-reg.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/w32help.h b/jnlib/w32help.h
index cb1dafcf5..e059da2b7 100644
--- a/jnlib/w32help.h
+++ b/jnlib/w32help.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_W32HELP_H
diff --git a/jnlib/xmalloc.c b/jnlib/xmalloc.c
index 1dafe55a6..eb6d5ab11 100644
--- a/jnlib/xmalloc.c
+++ b/jnlib/xmalloc.c
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/jnlib/xmalloc.h b/jnlib/xmalloc.h
index 21cfd508d..8c9c5292b 100644
--- a/jnlib/xmalloc.h
+++ b/jnlib/xmalloc.h
@@ -5,7 +5,7 @@
  *
  * JNLIB is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * JNLIB is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBJNLIB_XMALLOC_H
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 8a07df398..85791efaf 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index e231a82d4..8bc545dc9 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
index 0aa2a0e05..6ad9aea2b 100644
--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h
index ad53c71a7..ffdca2b9b 100644
--- a/kbx/keybox-defs.h
+++ b/kbx/keybox-defs.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KEYBOX_DEFS_H
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
index d28611377..1525a033f 100644
--- a/kbx/keybox-dump.c
+++ b/kbx/keybox-dump.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-file.c b/kbx/keybox-file.c
index e68e96cf9..7a40e964b 100644
--- a/kbx/keybox-file.c
+++ b/kbx/keybox-file.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c
index 6c01b4f3a..ea95c5f67 100644
--- a/kbx/keybox-init.c
+++ b/kbx/keybox-init.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c
index dea0047ca..0968cf8b3 100644
--- a/kbx/keybox-openpgp.c
+++ b/kbx/keybox-openpgp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a simple OpenPGP parser suitable for all OpenPGP key
diff --git a/kbx/keybox-search-desc.h b/kbx/keybox-search-desc.h
index 16668e8fc..98d813507 100644
--- a/kbx/keybox-search-desc.h
+++ b/kbx/keybox-search-desc.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* 
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
index f4e14adac..a45f617e9 100644
--- a/kbx/keybox-search.c
+++ b/kbx/keybox-search.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index 6657187e2..0cd50e532 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox-util.c b/kbx/keybox-util.c
index 6eb85ba3f..84de504c4 100644
--- a/kbx/keybox-util.c
+++ b/kbx/keybox-util.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/kbx/keybox.h b/kbx/keybox.h
index 922bcd5e0..43306947f 100644
--- a/kbx/keybox.h
+++ b/kbx/keybox.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KEYBOX_H
diff --git a/kbx/mkerrors b/kbx/mkerrors
index d3d096c5d..cd49d4d69 100755
--- a/kbx/mkerrors
+++ b/kbx/mkerrors
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 cat <<EOF
 /* Generated automatically by mkerrors */
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 23f2befc6..103e82f42 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 # Note that we have renamed the resulting binaries to from gpgkeys_foo
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 7d35320db..085ed99c4 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -7,7 +7,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index 9cec84065..0a70b4cc8 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -5,7 +5,7 @@
  *
  * GNUPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _CURL_SHIM_H_
diff --git a/keyserver/gpg2keys_mailto.in b/keyserver/gpg2keys_mailto.in
index 4d5f62711..4e5d6bc30 100755
--- a/keyserver/gpg2keys_mailto.in
+++ b/keyserver/gpg2keys_mailto.in
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 $sendmail="@SENDMAIL@ -t";
diff --git a/keyserver/gpg2keys_test.in b/keyserver/gpg2keys_test.in
index c335c65a2..9f2c0b6f7 100755
--- a/keyserver/gpg2keys_test.in
+++ b/keyserver/gpg2keys_test.in
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index e326df63c..f14b4c9a7 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index 58082790f..9933991b1 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index cb86b26c0..4729cc067 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 93b24844a..df107ff9c 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index 18158fc81..04e21b6a8 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h
index 154054407..3068592e8 100644
--- a/keyserver/ksutil.h
+++ b/keyserver/ksutil.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/po/ChangeLog b/po/ChangeLog
index cf3a9fae1..d2f41cd1f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* de.po: Update a few strings.
+
 2007-05-09  Werner Koch  <[email protected]>
 
 	* de.po: Update a few strings.
diff --git a/po/be.po b/po/be.po
index 1e62e1b1a..4f0b576b8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -15,153 +15,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Паўтарыце пароль: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,39 +172,39 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -214,335 +214,339 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "памылка чытаньня файла"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -555,7 +559,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -565,7 +569,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -577,441 +581,433 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 #, fuzzy
 msgid "yes"
 msgstr "yes [так]"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no [не]"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr ""
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1019,432 +1015,432 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr ""
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1452,133 +1448,133 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1588,47 +1584,47 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1636,7 +1632,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1656,15 +1652,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1674,7 +1670,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1682,582 +1678,582 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2265,16 +2261,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2288,23 +2284,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2312,19 +2308,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2333,11 +2329,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2378,28 +2374,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2407,13 +2403,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2422,36 +2418,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2467,527 +2463,527 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Даведка адсутнічае"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr ""
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr ""
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2995,244 +2991,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3240,204 +3236,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3445,160 +3441,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3606,533 +3602,533 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4142,7 +4138,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4152,48 +4148,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4203,44 +4199,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4248,7 +4244,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4263,34 +4259,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4298,7 +4294,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4306,733 +4302,733 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл \"%s\" ужо йснуе. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Увядзіце новае ймя файла"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5043,24 +5039,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5070,17 +5066,17 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5089,431 +5085,431 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr ""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr ""
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr ""
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr ""
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = quit [выйсьці]\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr ""
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5524,734 +5520,727 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr ""
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr ""
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr ""
-"па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6259,376 +6248,376 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 msgid "read options from file"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Даведка адсутнічае"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "праверыць подпіс"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no [не]"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "невядомая вэрсыя"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6639,311 +6628,311 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr ""
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr ""
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr ""
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "праверыць подпісы ключа"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6954,135 +6943,126 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr ""
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr ""
 
-#: sm/import.c:228
+#: sm/import.c:226
 msgid "error storing certificate\n"
 msgstr ""
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7093,13 +7073,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7107,245 +7087,249 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 msgid "                aka"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit [выйсьці]"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "пароль занадта доўгі\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
@@ -7355,7 +7339,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "error allocating enough memory: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7365,164 +7349,174 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr ""
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "зашыфраваць даньні"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [назва_файла]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "непадтрымліваецца"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
 
diff --git a/po/ca.po b/po/ca.po
index 969a60de3..104fa7b98 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -35,157 +35,157 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -196,40 +196,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -239,345 +239,350 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -590,7 +595,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -600,7 +605,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -612,255 +617,255 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: no s'ha trobat l'usuari\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
 # bolcats de memòria?  ivb
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
 # Indi. ivb
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "sí|si"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "ix"
 
 # «xX»?  ivb
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "xX"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -868,72 +873,64 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -941,134 +938,134 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1076,247 +1073,247 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
 # Ahà!  Abans «batch» està tal qual.  Cal unificar.  ivb
 # Fet. jm
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "no es pot fer això en el mode desatès sense «--yes»\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Voleu esborrar aquesta clau de l'anell? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "És una clau secreta! Voleu esborrar-la? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "s'ha netejat la informació de la confiança\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
 "esteu xifrant.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1325,215 +1322,215 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les crides a programes externs estan inhabilitades per tindre el fitxer "
 "d'opcions permissos insegurs\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "s'ha produït una eixida no natural del programa extern\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "no s'ha pogut executar el programa extern\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "la clau secreta és inusable"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1541,135 +1538,135 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1679,47 +1676,47 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1730,7 +1727,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1750,15 +1747,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1773,7 +1770,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1781,588 +1778,588 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2370,7 +2367,7 @@ msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "Comprova signatures amb claus conegudes amb confiança\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2380,7 +2377,7 @@ msgstr ""
 "a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n"
 "res a veure amb la xarxa de certificats (creada implícitament)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2394,17 +2391,17 @@ msgstr ""
 
 # "clau no confiable"? jm
 # No fiable, no de confiança, no de fiar...  ivb
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2418,7 +2415,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2428,16 +2425,16 @@ msgstr ""
 "xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
 "Si us plau, consulteu al vostre expert en seguretat primer."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduïu la grandària de la clau"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Contesteu «sí» o «no»"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2449,19 +2446,19 @@ msgstr ""
 "una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduïu el nom del propietari de la clau"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Introduïu un comentari opcional"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2475,11 +2472,11 @@ msgstr ""
 "O  continua la generació de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2558,12 +2555,12 @@ msgstr ""
 "\n"
 "Si no sabeu quina és la resposta correcta, contesteu «0»."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2571,11 +2568,11 @@ msgstr ""
 "Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
 "Tots els certificats també es perdran!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Contesteu «sí» si és correcte eliminar la subclau"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2586,7 +2583,7 @@ msgstr ""
 "una connexió de confiança a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2599,7 +2596,7 @@ msgstr ""
 "podria establir una connexió de confiança a través d'una altra clau ja\n"
 "certificada."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2607,7 +2604,7 @@ msgstr ""
 "La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2621,7 +2618,7 @@ msgstr ""
 "que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
 "hi ha una segona disponible."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2632,23 +2629,23 @@ msgstr ""
 "a la llista actual de preferències. Les marques de temps de totes les\n"
 "autosignatures afectades s'avançaran un segon.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2656,7 +2653,7 @@ msgstr ""
 "Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
 "predeterminat (apareix entre claudàtors)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2685,7 +2682,7 @@ msgstr ""
 "      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
 "      de correu com a invàlida.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2695,322 +2692,322 @@ msgstr ""
 "certificat de revocació. Per favor, sigueu concisos.\n"
 "Una línia buida indica el final del text.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "la clau secreta és inusable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -3020,22 +3017,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -3043,195 +3040,195 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3243,65 +3240,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3310,11 +3307,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3323,11 +3320,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3336,54 +3333,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3393,32 +3390,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3427,100 +3424,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3528,11 +3525,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3541,65 +3538,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3607,153 +3604,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3761,246 +3758,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4008,19 +4005,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4030,7 +4027,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4039,78 +4036,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4119,384 +4116,384 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4512,7 +4509,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4528,42 +4525,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4571,12 +4568,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4593,44 +4590,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4641,7 +4638,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4658,23 +4655,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4682,12 +4679,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4699,7 +4696,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4711,53 +4708,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4766,13 +4763,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4781,7 +4778,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4789,595 +4786,595 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Política de signatura crítica: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Política de signatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -5385,7 +5382,7 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5393,82 +5390,82 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fitxer «%s» existeix. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: el sufix és desconegut\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5484,7 +5481,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5495,24 +5492,24 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5522,17 +5519,17 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5547,161 +5544,161 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMxXoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "No hi ha cap valor de confiança assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No ho sé\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO confie\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Hi confie absolutament\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al menú principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omet aquesta clau\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " x = ix\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5713,112 +5710,112 @@ msgstr ""
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5826,182 +5823,182 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
 # Indi? ivb
 # Yeh... jm
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "A ser revocada per:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta és una clau de revocació sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6020,125 +6017,125 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
 
 # Parts?  Peces?  ivb
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no és vàlida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "AVÍS: la clau és feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "s'està generant la suma de comprovació desaconsellada de 16-bits per a la "
 "protecció de la clau secreta\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
 # És no-wrap?  ivb
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6147,7 +6144,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6155,61 +6152,61 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP "
 "2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP "
 "2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6217,7 +6214,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6226,76 +6223,76 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6304,361 +6301,361 @@ msgstr ""
 "# Llista de valors de confiança assignats, creat el %s\n"
 "# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "la línia és massa llarga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa els valors de confiança"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error en trobar el registre de confiança: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): %"
 "s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
 "fix-trustdb».\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la línia d'entrada és superior a %d caràcters\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6669,147 +6666,140 @@ msgstr ""
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia?  ivb
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr ""
-"si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6817,386 +6807,386 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[no establert]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "error: l'empremta digital és invàlida\n"
@@ -7212,7 +7202,7 @@ msgstr "error: l'empremta digital és invàlida\n"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7223,308 +7213,308 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "força signatures v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7535,138 +7525,128 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent no està disponible en aquesta sessió\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Seleccioneu quin tipus de clau voleu:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificat correcte"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7677,13 +7657,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7691,247 +7671,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 msgid "No argument allowed"
 msgstr ""
 
@@ -7940,7 +7924,7 @@ msgstr ""
 msgid "error allocating enough memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7950,168 +7934,182 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "desxifratge correcte\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nom_del_fitxer]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no s'ha creat l'anell: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Seleccioneu quin tipus de clau voleu:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "la extensió de xifrat «%s» no s'ha carregat per tindre permissos "
diff --git a/po/cs.po b/po/cs.po
index e1b59ce3a..677ab6647 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -15,154 +15,154 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN administr�tora"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte tento PIN: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,40 +173,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vlo�it heslo\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,344 +216,349 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +571,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +581,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -588,246 +593,246 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ano"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "ne"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "ukon�it"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okey|okey"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "zru�it|zru�it"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "zZ"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -835,191 +840,183 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1030,226 +1027,226 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Smazat tento kl�� ze souboru kl���? (a/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� kl��! - opravdu smazat? (a/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informace o d�v�ryhodnosti vlastn�ka kl��e vymaz�ny\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifry: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1258,200 +1255,200 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "vol�n� extern�ch program� je zak�z�no, proto�e file permissions nejsou\n"
 "nastaveny nebezpe�n�\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
 "do�asn� soubory (temp files)\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nelze spustit program `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nelze spustit shell `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba p�i vol�n� extern�ho programu: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "neo�ek�van� konec extern�ho programu\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "nelze spustit extern� program\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nelze p�e��st odpov�� extern�ho programu: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1459,132 +1456,132 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1594,51 +1591,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1646,7 +1643,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1664,17 +1661,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1684,7 +1681,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1692,79 +1689,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1772,21 +1769,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1794,7 +1791,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1802,483 +1799,483 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2286,7 +2283,7 @@ msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
 "Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2297,7 +2294,7 @@ msgstr ""
 "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
 "certifik�t�\"."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2309,17 +2306,17 @@ msgstr ""
 "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
 "jako absolutn� d�v�ryhodn�\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2343,7 +2340,7 @@ msgstr ""
 "\n"
 "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2353,16 +2350,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
 "Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�lku kl��e"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpov�zte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2374,19 +2371,19 @@ msgstr ""
 "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te jm�no dr�itele kl��e"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailovou adresu (nepovinn�, ale velmi doporu�ovan�)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment��"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2400,11 +2397,11 @@ msgstr ""
 "O  pro pokra�ov�n� generov�n� kl��e.\n"
 "Q  pro ukon�en� generov�n� kl��e."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jestli�e chcete generovat podkl��, odpov�zte \"ano\" (nebo jen \"a\")."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2477,12 +2474,12 @@ msgstr ""
 "\n"
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2491,11 +2488,11 @@ msgstr ""
 "\".\n"
 "V�echny certifik�ty budou tak� ztraceny!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2505,7 +2502,7 @@ msgstr ""
 "proto�e m��e b�t d�le�it� p�i vytv��en� d�v�ry kl��e nebo jin�ho kl��e\n"
 "ceritifikovan�ho t�mto kl��em."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2517,13 +2514,13 @@ msgstr ""
 "byl pou�it, proto�e tento podpisovac� kl�� m��e vytvo�it d�v�ru\n"
 "prost�ednictv�m jin�ho ji� certifikovan�ho kl��e."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstranit z Va�eho souboru kl���."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2536,7 +2533,7 @@ msgstr ""
 "pou��vat. Ud�lejte to jenom v p��pad�, kdy je tento podpis kl��e\n"
 "j�m sam�m z n�jak�ho d�vodu neplatn� a kdy je k dipozici kl�� jin�."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2546,25 +2543,25 @@ msgstr ""
 "na aktu�ln� seznam p�edvoleb. �asov� raz�tka v�ech dot�en�ch podpis�\n"
 "kl��� jimi samotn�mi budou posunuty o jednu vte�inu dop�edu.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
 " napsal(a)."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadejte n�zev souboru, ke kter�mu se podpis vztahuje"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Pokud si p�ejete p�eps�n� souboru, odpov�zte \"ano\""
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2572,7 +2569,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zev souboru. Pokud pouze stisknete RETURN, bude\n"
 "pou�it implicitn� soubor (kter� je uk�z�n v z�vork�ch)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2600,7 +2597,7 @@ msgstr ""
 "      Toto pou�ijte, pokud by se identifik�tor u�ivatele u� nem�l pou��vat;\n"
 "      norm�ln� se pou��v� k ozna�en� neplatn� e-mailov� adresy.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2610,528 +2607,528 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�n�. \n"
 "Text kon�� pr�zdn�m ��dkem.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez ID u�ivatele: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importov�no: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                 beze zm�n: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� ID u�ivatel�: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             nov� podkl��e: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nov� podpisy: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       nov� revokace kl���: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "     tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             neimportov�no: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         odstran�n� podpisy: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zdroj bloku kl��e `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3143,17 +3140,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3163,47 +3160,47 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3212,11 +3209,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3226,13 +3223,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3242,54 +3239,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3299,31 +3296,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3332,76 +3329,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3409,11 +3406,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3421,186 +3418,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3612,156 +3609,156 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3769,71 +3766,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3841,17 +3838,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3859,7 +3856,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3868,74 +3865,74 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3944,363 +3941,363 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4316,7 +4313,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4332,38 +4329,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4371,11 +4368,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4391,44 +4388,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4439,7 +4436,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4454,25 +4451,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4480,12 +4477,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4497,7 +4494,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4510,50 +4507,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4561,12 +4558,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4574,7 +4571,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4582,666 +4579,666 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovan� keyserver: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� algoritmus ve�ejn�ho kl��e %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� �ifrovac� algoritmus %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�m� p��pona\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5252,24 +5249,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5278,17 +5275,17 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5302,111 +5299,111 @@ msgstr ""
 "kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
 "Vhodn� velikost obr�zku je asi 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t? (a/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "d�vod pro revokaci: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Nakolik d�v��ujete tvrzen�, �e tento kl�� pat�� uveden�mu u�ivateli?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nev�m nebo ne�eknu\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5415,37 +5412,37 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? (a/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nic nenazna�uje tomu, �e tento kl�� pat�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Je zde ��ste�n� d�v�ra, �e tento kl�� pat�� uveden�mu uv�ivateli\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento kl�� pravd�podobn� n�le�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5456,108 +5453,108 @@ msgstr ""
 "n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5565,178 +5562,178 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je nezn�m� nebo je zneplatn�n\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Revokov�n:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5755,119 +5752,119 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generuji _nevhodn�_ 16-ti bitov� kontroln� sou�et pro ochranu soukrom�ho "
 "kl��e\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "vytvo�en slab� kl�� - zkou��m znovu\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5875,7 +5872,7 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5883,53 +5880,53 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5937,7 +5934,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5946,23 +5943,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5970,52 +5967,52 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6024,331 +6021,331 @@ msgstr ""
 "# Seznam p�id�len�ch hodnot d�v�ry, vytvo�en %s\n"
 "# (Pou�ijte \"gpg --import-ownertrust\" k jeho obnov�)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "sloupec sch�z�"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "neplatn� fingerprint"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "sch�z� hodnota d�v�ryhosdnosti vlastn�ka"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nemohu vytvo�it z�mek pro  `%s'\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nelze zam��t `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepoda�ilo se vytvo�it z�znam verze: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kl�� %s: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kl�� %s se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kl�� %s: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kl�� %s ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 "14 fixn� d�lka na kterou se p�ekl�d� see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6356,12 +6353,12 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6371,148 +6368,142 @@ msgstr ""
 "Pros�m, nezapome�te, �e soubor s podpisem (.sig nebo .asc)\n"
 "by m�l b�t prvn�m souborem zadan�m na p��kazov� ��dce.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6521,376 +6512,376 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kl�� k dispozici na: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA fingerprint: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikovat podpis"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "ne"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[nen� nastaven]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6901,316 +6892,316 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "kontrolovat podpisy"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7221,137 +7212,127 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7362,13 +7343,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7376,247 +7357,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Podpis vytvo�en %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \"%s\""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�it"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "��dek je p��li� dlouh�"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
 # c-format
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
@@ -7626,7 +7611,7 @@ msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7636,166 +7621,179 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [jm�no souboru]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
diff --git a/po/da.po b/po/da.po
index 6e3c1a12b..bba59beaa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -17,120 +17,120 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # er det klogt at overs�tte TrustDB?
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -138,32 +138,32 @@ msgid ""
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Indtast bruger-id: "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Gentag kodes�tning: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -174,40 +174,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Brug denne n�gle alligevel? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Indtast kodes�tning: "
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -217,337 +217,341 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "panser: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -560,7 +564,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -570,7 +574,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -582,450 +586,442 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: bruger ikke fundet\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ja"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "n"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "afslut"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1033,436 +1029,436 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "d�rlig hemmelig n�gle"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1470,137 +1466,137 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1610,53 +1606,53 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1676,16 +1672,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1695,7 +1691,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1703,603 +1699,603 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2307,16 +2303,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2330,23 +2326,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2354,19 +2350,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2375,11 +2371,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2420,28 +2416,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2449,13 +2445,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2464,30 +2460,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2495,7 +2491,7 @@ msgstr ""
 "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
 "forvalgte navn (som er vist i klammer) blive brugt."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2511,531 +2507,531 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "d�rlig hemmelig n�gle"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3043,466 +3039,466 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3510,172 +3506,172 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3683,549 +3679,549 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4235,7 +4231,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4245,52 +4241,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4300,44 +4296,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4348,7 +4344,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4363,24 +4359,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4388,12 +4384,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4401,7 +4397,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4409,746 +4405,746 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5156,26 +5152,26 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5184,17 +5180,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5203,458 +5199,458 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 # virker j automatisk istedetfor y?
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Denne n�gle tilh�rer os\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5665,739 +5661,733 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr ""
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "panser: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "rev- forkert n�gletilbagekald\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "s�t aflusningsflag"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6405,384 +6395,384 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingeraftryk:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "godkend en signatur"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "n"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "ukendt version"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6792,308 +6782,308 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "vis pr�ferencer"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7104,138 +7094,129 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr ""
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Godt certifikat"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
 # er det klogt at overs�tte TrustDB?
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
 # er det klogt at overs�tte TrustDB?
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7246,13 +7227,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7260,248 +7241,252 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "afslut"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "brug: gpg [flag] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -7511,7 +7496,7 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7521,164 +7506,173 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr ""
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "krypt�r data"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "rev- forkert n�gletilbagekald\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
+
 #~ msgid "Enter passphrase: "
 #~ msgstr "Indtast kodes�tning: "
 
diff --git a/po/de.po b/po/de.po
index 7a75ae7f0..b0dd64881 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
-"PO-Revision-Date: 2007-05-09 11:14+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
+"PO-Revision-Date: 2007-07-04 21:44+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +31,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,99 +39,99 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Erkannte Karte hat die Seriennummer: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "Fehler beim Holen der Authentisierungsschlüssel-ID der Karte: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "keine passender Kartenschlüssel gefunden: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bitte geben Sie die Passphrase für den SSH-Schlüssel %0A  %c ein"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -140,29 +140,29 @@ msgstr ""
 "Bitte geben Sie eine Passphrase ein, um den empfangenen geheimen Schlüssel%%"
 "0A   %s%%0A im Schlüsselspeicher des gpg-agenten zu schützen"
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstrom aus dem Socket schlug fehl: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 msgid "Repeat this PIN"
 msgstr "PIN bitte wiederholen"
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -177,34 +177,34 @@ msgstr[1] ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
 "Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 msgid "Take this one anyway"
 msgstr "Diese trotzdem benutzen"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 msgid "Enter new passphrase"
 msgstr "Neue Passphrase eingeben"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Bitte geben Sie die Passphrase ein%0Aum Ihren Schlüssel zu schützen"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -212,109 +212,109 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM as SCdaemon"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht bem Signieren"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -322,135 +322,139 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Aufruf: gpg-preset-passphrase [Optionen] KEYGRIP (-h für Hilfe)\n"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -458,11 +462,11 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Kennwortpuffer-Pflege\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Aufruf: gpg-protect-tool [Optionen] (-h für Hilfe)\n"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -470,16 +474,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -487,7 +491,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -495,58 +499,58 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 
@@ -559,7 +563,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -571,7 +575,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -583,7 +587,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -592,235 +596,235 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr "Nein"
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "Fehler beim Erstellen des Sockets: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 msgid "host not found"
 msgstr "Host nicht gefunden"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr "Beim setzen der gpg-agent Optionen ist ein problem aufgetreten\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ja"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nein"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "abbrechen|abbrechen"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 "Kein sicherer Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-Hülle: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
 " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -828,193 +832,185 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen maximal einmal verwenden\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1025,226 +1021,226 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schlüssel mittels Fingerprint an)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? (j/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "Der \"Ownertrust\" wurde gelöscht\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "benutze Cipher %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur für RSA-Schlüssel mit maximal 2048 Bit "
 "verschlüsselt werden\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "Die IDEA-Verschlüsselung kann nicht mit allen Zielschlüsseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1252,7 +1248,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1261,203 +1257,203 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Packets\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "Ausführen von externen Programmen wird nicht unterstützt\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "Ausführen von externen Programmen ist ausgeschaltet, da die Dateirechte "
 "nicht sicher sind\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Diese Plattform benötigt temporäre Dateien zur Ausführung von externen\n"
 "Programmen\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Ausführen des Programms `%s' nicht möglich: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Ausführen der Shell `%s' nicht möglich: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "ungewöhnliches Ende eines externen Programms\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "Externes Programm konnte nicht aufgerufen werden\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Die Ausgabe des externen Programms konnte nicht gelesen werden: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "Exportiere auch Unterschriften die als nicht exportfähig markiert sind"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "Die Passphrase von exportierten Unterschlüssel entfernen"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr "Exportiere Schlüssel in einem auf S-Ausdrücken basierenden Format"
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schlüssel %s: ungeschützt - übersprungen\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr "Ein ungeschützter Unterschlüssel wird exportiert werden\n"
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Entfernen des Schutzes für des Unterschlüssel fehlgeschlagen: %s\n"
 
 # translated by wk
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schlüssel %s hat keine einfache SK-Prüfsumme\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "`%s' automatisch via %s geholt\n"
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschlüssel zum öffentlichen Unterschlüssel %s - ignoriert\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1465,132 +1461,132 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1600,47 +1596,47 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1649,7 +1645,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1669,17 +1665,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1689,7 +1685,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1697,73 +1693,73 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Öff.Schlüssel: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1771,20 +1767,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1792,501 +1788,501 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der "
 "Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2297,7 +2293,7 @@ msgstr ""
 "um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
 "(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2309,19 +2305,19 @@ msgstr ""
 "auf deren geheimen Schlüssel Sie Zugruff haben.\n"
 "Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu vertrauen\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Wenn Sie diesen nicht vertrauenswürdigen Schlüssel trotzdem benutzen "
 "wollen,\n"
 "so antworten Sie mit \"ja\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2347,7 +2343,7 @@ msgstr ""
 "Der erste Schlüssel (Hauptschlüssel) muß immer ein Schlüssel sein, mit dem\n"
 "unterschrieben werden kann."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2358,16 +2354,16 @@ msgstr ""
 "Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
 "einem Sicherheistexperten beraten."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Wählen Sie die gewünschte Schlüssellänge"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Geben Sie \"ja\" oder \"nein\" ein"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2379,21 +2375,21 @@ msgstr ""
 "erhält dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
 "der Rechner den Wert als Intervall (von-bis) zu deuten."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
 "aber sehr empfehlenswert."
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2407,12 +2403,12 @@ msgstr ""
 "F  um mit der Schlüsselerzeugung fortzusetzen.\n"
 "B  um die Schlüsselerzeugung abbrechen."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2485,11 +2481,11 @@ msgstr ""
 "\n"
 "Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2497,12 +2493,12 @@ msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2514,7 +2510,7 @@ msgstr ""
 "Schlüssel\n"
 "herzustellen."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2527,7 +2523,7 @@ msgstr ""
 "sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg komplettieren."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2535,7 +2531,7 @@ msgstr ""
 "Diese Beglaubigung ist ungültig. Es ist sinnvoll sie aus Ihrem\n"
 "Schlüsselbund zu entfernen."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2551,7 +2547,7 @@ msgstr ""
 "irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
 "ist."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2562,27 +2558,27 @@ msgstr ""
 "betroffenen\n"
 "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, daß Sie sich bei der Eingabe der Passphrase nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "übereinstimmen, wird die Passphrase akzeptiert."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehört"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2591,7 +2587,7 @@ msgstr ""
 "Eingabetaste betätigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2619,7 +2615,7 @@ msgstr ""
 "      Um bekanntzugeben, daß die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ungültige Emailadresse hin.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2629,130 +2625,130 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte möglichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 "beim Import eines geheimen Schlüssels einen öffentliche Schlüssel erzeugen"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    Signaturen bereinigt: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      User-IDs bereinigt: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2761,407 +2757,407 @@ msgstr ""
 "WARNING: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
 "Verfahren für folgende User-ID:\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Hashmethode %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "diesen Schüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
 "Verfahrenskombinationen zu vermeiden\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
 "ändern\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
 "übersprungen\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schlüssel %s: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schlüssel %s: geheimer Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
 "angebracht werden\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: Nicht exportfähige Unterschrift (Klasse %02x) - übersprungen\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
 "übersprungen\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: unerwartete Unterschriftenklasse (0x%02x) - übersprungen\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
 "vorhanden\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "Hinweis: Eine Schlüsselseriennr stimmt nicht mit derjenigen der Karte "
 "überein\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Hinweis: Hauptschlüssel ist online und auf der Karte gespeichert\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Hinweis: Zweitschlüssel ist online und auf der Karte gespeichert\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Schlüsselbund `%s' erstellt\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3174,17 +3170,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollständig\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3194,47 +3190,47 @@ msgstr ""
 "Eine Tiefe größer 1 erlaubt dem zu unterschreibenden Schlüssel\n"
 "Trust-Signatures für Sie zu machen.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschränken,\n"
 "oder nur die Eingabetaste für keine Domain\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist unterschreibbar."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3243,11 +3239,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3256,13 +3252,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3271,44 +3267,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schlüssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3316,11 +3312,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies würde den Schlüssel für PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3330,32 +3326,32 @@ msgstr ""
 "wollen, wirklich der o.g. Person gehört?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3364,79 +3360,79 @@ msgstr ""
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel \"%s\" (%s) beglaubigen wollen\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als unwiderrufbar markiert werden.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Die Unterschrift wird als nicht-exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Die Unterschrift wird als nicht-exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schüsselelemente- keine "
 "Passphrase ist zu ändern.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3444,11 +3440,11 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3456,190 +3452,190 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Möchten Sie dies wirklich tun? (j/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "Fingerabdruck des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "Unterschlüssel N auswählen"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "Signaturen prüfen"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Unterschrift beglaubigen"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "die ausgewählten User-ID unwiderrufbar beglaubigen"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "ausgewählte User-IDs entfernen"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "einen Unterschlüssel hinzufügen"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "der Smartcard einen Schlssel hinzufgen"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "einen Schlssel auf die Smartcard schieben"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "eine Sicherungskopie des Schlssels auf die Smartcard schieben"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "ausgewählte Unterschlüssel entfernen"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen dem Auflisten geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "Eine Notation für die ausgewählten User-IDs setzen"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "Ausgewählte User-ID widerrufen"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "ausgewählte Foto-IDs anzeigen"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und unbrauchbare Unterschrifen aus dem "
 "Schlüssel entfernen"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und alle Unterschrifen aus dem Schlüssel "
 "entfernen"
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schlüsselblocks \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3652,227 +3648,227 @@ msgstr ""
 "Unterschriften\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannter Unterschriftentyp `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Befehl benötigt einen Dateinamen als Argument\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
 "Datenbank benutzt wird\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Setze die Liste der Voreinstellungen auf:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 "(j/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Dieser Schlüssel könnte durch %s mit Schlüssel %s  widerrufen worden sein"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "Aufruf: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3880,18 +3876,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3899,7 +3895,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID as primär angesehen wird.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3909,74 +3905,74 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User-ID \"%s\": %d Signatur entfernt\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3986,373 +3982,373 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Unterschreibens nicht mächtig und braucht deshalb "
 "keine Rücksignatur\n"
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "Voreinstellung `%s' ist doppelt\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "zu viele Verschlüsselungeinstellungen\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
 "Digestlänge nicht verwenden\n"
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Unterschr."
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Authentisierung"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "UuVvAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Unterschreibfähigkeit\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsfähigkeit\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und Elgamal (voreingestellt)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur unterschreiben/beglaubigen)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4368,7 +4364,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4384,38 +4380,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4423,11 +4419,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4443,44 +4439,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4491,7 +4487,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4506,23 +4502,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4530,12 +4526,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4548,7 +4544,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4559,50 +4555,50 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4611,12 +4607,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4624,7 +4620,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4632,675 +4628,675 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "niemals   "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Entscheidende Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Entscheidender bevorzugter Schlüsselserver"
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Entscheidender Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Schlüsselbund"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Puffern des Schlüsselbundes `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "verwende temporäre Dateien, um Daten an die Schlüsselserverhilfsprogramme zu "
 "geben"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "Temporäre Dateien nach Nutzung nicht löschen"
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "Schlüssel für die Unterschriftenprüfung automatisch holen"
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 "Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten"
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Schlüsselserver-Option `%s' wird auf dieser Plattform nicht "
 "verwendet\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "abgeschaltet"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche Namen auf %s-Server %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "suche Namen auf %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "sende Schlüssel %s auf den %s-Server %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf %s-Server %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "Kein Schlüsselserver-Vorgang\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
 "GnuPG-Version (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "Schlüsselserver sendete VERSION nicht\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "Externe Schlüsselserveraufrufe werden in diesem \"Build\" nicht unterstützt\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserver-Zeitüberschreitung\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "interner Fehler Schlüsselserver\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "ein Schlüssel wird per %s aktualisiert\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "Keine Unterschrift gefunden\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Unterschriftdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Unterschrift vom %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %s mittels %s-Schlüssel ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat von `%s' schlug fehl in %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) schlug fehl in %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Überschreiben (j/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5311,24 +5307,24 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5337,18 +5333,18 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
 
 # translated by wk
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5363,156 +5359,156 @@ msgstr ""
 "wir Ihr Schlüssel leider auch sehr groß werden.  Ein Bild der GröÂße\n"
 "240x288 Pixel ist eine gute Wahl.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Dateiname mit JPEG für die Foto-ID eingeben: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG-Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Diese JPEG-Datei ist echt groß (%d Byte)!\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' ist keine JPEG-Datei\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Es ist kein \"trust value\" zugewiesen für:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Wie sicher sind Sie, daß dieser Schlüssel wirklich dem angegebenen Besitzer "
 "gehört?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Weiß nicht so recht\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Nein, ihm traue ich NICHT\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr " m = Zurück zum Menü\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr " s = diesen Schlüssel überspringen\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Wollen Sie diesem Schlüssel wirklich uneingeschränkt vertrauen? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Es gibt keine Garantie, daß dieser Schlüssel wirklich dem angegebenen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Es gibt nur eine beschränkte Garantie, daß dieser Schlüssel wirklich dem "
 "angegebenen Besitzer gehört.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5522,116 +5518,116 @@ msgstr ""
 "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
 "können Sie die nächste Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "WARNUNG: Dieser schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
 "vorhanden\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 "Hinweise: Adresse des Unterzeichners `%s' passt nicht zum DNS-Eintrag\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "\"Trust\"-Ebene auf VOLLSTÄNDIG geändert (wg. gültiger PKA-Info)\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "\"Trust\"-Ebene auf NIEMALS geändert (wg. falscher PKA-Info)\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Derzeitige Empfänger:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5639,182 +5635,182 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Ungenannter Empfänger; Versuch mit geheimen Schlüssel %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "WARNUNG: Das Verschlüsselungsverfahren %s wurde nicht in den "
 "Empfängereinstellungen gefunden\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "Schlüssel %s hat keine User-IDs\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Schlüssel soll widerrufen werden von:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dies ist ein \"sensitiver\" Widerrufsschlüssel)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugehöriger öffentlicher Schlüssel: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "Öffentliche Schlüssel paßt nicht zum geheimen Schlüssel!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
 # translated by wk
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5834,124 +5830,124 @@ msgstr ""
 "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
 "machen.\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund für den Widerruf:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund für Widerruf: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Ist das OK? (j/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "Hashschutzverfahren %d wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Ungültige Passphrase; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
 "         bitte Passphrase nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mißbilligte 16-bit Prüfsumme wird zum Schutz des geheimen Schlüssels "
 "benutzt\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
 "sym.Verschlüsselung nicht vermieden werden!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-Schlüssel %s verwendet einen unsicheren (%u Bit-) Hash\n"
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-Schlüssel %s benötigt einen mindestens %u Bit langen Hash\n"
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5959,7 +5955,7 @@ msgstr ""
 "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhrenproblem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5967,65 +5963,65 @@ msgstr ""
 "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhrenproblem)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schlüssel %s, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Notationen können in einen v3- (PGP 2.x-artigen-) Schlüssel nicht "
 "eingetragen werden\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht "
 "eingetragen werden\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
 "eingetragen werden\n"
 
 # translated by wk
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht gespeichert "
 "werden\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6033,7 +6029,7 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6042,23 +6038,23 @@ msgstr ""
 "WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
 "(zu groß). Verwende \"unerweiterte\".\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6066,53 +6062,53 @@ msgstr ""
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "übersprungen \"%s\": doppelt\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
 "NICHT sicher genug!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6121,337 +6117,337 @@ msgstr ""
 "# Liste de zugewiesenden Trustwerte, erzeugt am %s\n"
 "# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "Fehler in `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "Zeile ist zu lang"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "Doppelpunkt fehlt"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ungültiger Fingerabdruck"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "\"Owner trust\"-Wert fehlt"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Fehler beim Suchen des \"Trust records\" in `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Lesefehler in `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu groß\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kann aus `%s' nicht zugreifen: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "Datei `%s' konnte nicht gesperrt werden\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "'%s' kann nicht gesperrt werden\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ungültige trust-db erzeugt\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist länger als %d Zeichen\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schlüssel %s ist als uneingeschränkt vertrauenswürdig gekennzeichnet\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
 "Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "verwende Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[verfall.]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[  unbek.]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[  undef.]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ vollst.]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ uneing.]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "niemals"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdige Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6459,14 +6455,14 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  unterschrieben: %3d  Vertrauen: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
 "fehlgeschlagen: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6476,64 +6472,58 @@ msgstr ""
 "Denken Sie daran, daß die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "fd=%d kann nicht geöffnet werden: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
-#, fuzzy, c-format
+#: jnlib/utf8conv.c:86
+#, c-format
 msgid "error loading `%s': %s\n"
-msgstr "Fehler beim Lesen von `%s': %s\n"
-
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "Siehe %s für weitere Infos\n"
+msgstr "Fehler beim Laden von `%s': %s\n"
 
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open fehlgeschlagen: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "Debug Flags setzen"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "Alle Debug Flags setzen"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 msgid "Please report bugs to "
 msgstr "Bitte richten sie Berichte über Bugs (Softwarefehler) an "
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Aufruf: kbxutil [Optionen] [Dateien] (-h für Hilfe)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6541,83 +6531,83 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs erzeugt: %"
 "lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
@@ -6625,150 +6615,150 @@ msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "Die Tastatur des Kartenleser nicht benutzen"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "Erlaube die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6776,221 +6766,221 @@ msgstr ""
 "Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "Kein aktiver Dirmngr - `%s' wird einer gestartet\n"
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Die Variable DIRMNGR_INFO ist fehlerhaft\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "Die Dirmngr Protokollversion %d wird nicht unterstützt\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
 "versucht\n"
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr "Notiz: Die unkritische Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 "Bitte vergewissern Sie sich das der \"dirmngr\" richtig installierrt ist\n"
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in gpg-agent ausgeschaltet\n"
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 msgid "none"
 msgstr "keine"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 msgid "[none]"
 msgstr "[keine]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 msgid "[Error - invalid encoding]"
 msgstr "[Fehler - Ungültige Kodierung]"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
-msgstr "[Fehler - Nich genügend Speicher]"
+msgstr "[Fehler - Nicht genügend Speicher]"
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr "[Fehler - Kein Name]"
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 msgid "[Error - invalid DN]"
 msgstr "[Fehler - Ungültiger DN]"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7003,301 +6993,301 @@ msgstr ""
 "S/N %s, ID %08lX, erzeugt %s\n"
 "zu entsperren"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
 "sollen\n"
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "Zeile %d: Ungültiges Verfahren\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "Zeile %d: Ungültige Schlüssellänge %u (gültig Werte: %d bis %d)\n"
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "Zeile %d: Kein Subject-Name angegeben\n"
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr "Zeile %d: ungültiger Subject-Name-Label `%.*s'\n"
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr "Zeile %d: ungültige Betreffbezeichnung `%s' in Spalte %d\n"
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Zeile %d: Keine gültige E-Mailadresse\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "Zeile %d: Fehler beim Lesen des Schlüssels `%s' von der Karte: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "Zeile %d: Fehler beim Holen des Schlüssels per \"Keygrip\" `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, c-format
-msgid "line %d: key generation failed: %s\n"
-msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
+msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s <%s>\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(Dies ist der RC-2 Algorithmus)\n"
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dies is wahrscheinlich keine verschlüsselte Nachricht)\n"
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "Zertifikat `%s' nicht gefunden: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Fehler beim Sperren der Keybox: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Doppeltes Zertifikat `%s' gelöscht\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "Zertifikat `%s' gelöscht\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr "Benutze den System Dirmngr when verfügbar"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7306,135 +7296,125 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr "Die Schlüsselerzeugung ist über die Kommandozeile nicht möglich\n"
-
-#: sm/gpgsm.c:1592
-#, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr ""
-"Bitte verwenden Sie das Skript \"%s\" zur Erzeugung eines neuen Schlüssels.\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "gesamte verarbeitete Anzahl: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 msgid "error storing certificate\n"
 msgstr "Fehler beim speichern des Zertifikats\n"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr "Sie sollten zuerst den gpg-agent starten\n"
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "Kann den Fingerprint nicht ermitteln\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr "Kann keinen KeyDB Handler bereitstellen\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Fehler beim Speichern des Zertifikats: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 "GPG_TTY wurde nicht gesetzt - ein (möglicherweise falscher) Standardwert "
 "wird deshalb verwendet\n"
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Der Fingerabdruck in `%s', Zeile %d is fehlerhaft formatiert\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "Ungültiger Landescode in `%s', Zeile %d\n"
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7451,7 +7431,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7459,7 +7439,7 @@ msgstr ""
 "Bitte beachten Sie, daß diese Software nicht offiziell zur Erzeugung\n"
 "oder Prüfung von qualifizierten Signaturen zugelassen ist.\n"
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7471,61 +7451,61 @@ msgstr ""
 "zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
 "Signatur erzeugen wird."
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr "[Datum nicht vorhanden]"
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr "mittels Zertifikat ID %08lX\n"
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 msgid "                aka"
 msgstr "                alias"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "Weniger Ausgaben"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr "Druckdaten hexkodiert ausgeben"
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr "Dekodiere empfangene Datenzeilen"
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-connect-agent [Optionen] (-h für Hilfe)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7533,158 +7513,162 @@ msgstr ""
 "Syntax: gpg-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Optuin \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr "Einstellungen des System HTTP-Proxy benutzen"
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Aufruf: gpgconf [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7692,19 +7676,19 @@ msgstr ""
 "Syntax: gpgconf {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 msgid "usage: gpgconf [options] "
 msgstr "Aufruf: gpgconf [Optionen] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -7713,7 +7697,7 @@ msgstr "Argumente sind nicht erlaubt"
 msgid "error allocating enough memory: %s\n"
 msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 msgid ""
 "@\n"
 "Commands:\n"
@@ -7723,35 +7707,35 @@ msgstr ""
 "@KBefehle:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr "Entschlüsselungsmodus"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 msgid "encryption modus"
 msgstr "Verschlüsselungsmodus"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr "Toolklasse (Konfuzius)"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 msgid "program filename"
 msgstr "Programmdateiname"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -7761,126 +7745,141 @@ msgstr ""
 "keyfileSCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
 "Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s auf %s brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s auf %s schlug mit Status %i fehl\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "Fehler beim Lesen von %s: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "Fehler beim Schliessen von %s: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr "Option --programm nicht angegeben\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "nur --decrypt und --encrypt sind vorhanden\n"
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr "keine --keyfile -Option angegeben\n"
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr "Kann \"args-vector\" nicht zuteilen\n"
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "Pipe kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "Pty kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "Kann nicht fork()en: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, c-format
 msgid "select failed: %s\n"
 msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, c-format
 msgid "read failed: %s\n"
 msgstr "Lesen schlug fehl: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "Kind brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "entweder %s oder %s muß angegeben sein\n"
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr "keine Klasse angegeben\n"
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "Klasse %s wird nicht unterstützt\n"
 
+#~ msgid "no running gpg-agent - starting one\n"
+#~ msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
+
+#~ msgid "can't connect to the agent - trying fall back\n"
+#~ msgstr ""
+#~ "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
+
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "Die Schlüsselerzeugung ist über die Kommandozeile nicht möglich\n"
+
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr ""
+#~ "Bitte verwenden Sie das Skript \"%s\" zur Erzeugung eines neuen "
+#~ "Schlüssels.\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte "
@@ -7888,9 +7887,3 @@ msgstr "Klasse %s wird nicht unterstützt\n"
 
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
-
-#~ msgid ">.\n"
-#~ msgstr ">.\n"
-
-#~ msgid ".\n"
-#~ msgstr ".\n"
diff --git a/po/el.po b/po/el.po
index 5229dcd56..dbda7e3a2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -14,154 +14,154 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "����������� �� ����� ������: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,40 +172,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�������������� �� ����� ������\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,343 +215,348 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "������ ���������: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +569,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +579,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -586,249 +591,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[User id ��� �������]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "���|���"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "���|���"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "�����������"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -836,205 +841,197 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1042,241 +1039,241 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�������� ����� ��� �������� ��� �� ����������; "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "���������� ����������� ������������-���������\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "����� ��� ���������������: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
 "pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1284,7 +1281,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1293,100 +1290,100 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
 "�������\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "������� ������ ��� ���������� ������������\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "�������� ��������� ��� ���������� ������������\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -1394,109 +1391,109 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "�� ��������������� ������� ������"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1504,133 +1501,133 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1640,47 +1637,47 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1688,7 +1685,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1708,15 +1705,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1726,7 +1723,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1734,589 +1731,589 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2324,7 +2321,7 @@ msgstr ""
 "�������: gpg [��������] [������]\n"
 "������� ��������� �� �������� �� ������ ������������ �������\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2335,7 +2332,7 @@ msgstr ""
 "������������,\n"
 "��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2349,19 +2346,19 @@ msgstr ""
 "������\n"
 "���� ����� �����������\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
 "\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2375,7 +2372,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2385,16 +2382,16 @@ msgstr ""
 "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
 "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "�������������� �� ������� ��� ��������"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "��������� \"yes\"(���) � \"no\"(���)"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2406,19 +2403,19 @@ msgstr ""
 "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
 "��������� �� ���������� ��� ���� ��� ��������."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "�������������� �� ����� ��� �������������"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "�������������� ����������� ��� ��������� email (����������)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "�������� ����������� �������������� ��� ������"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2432,13 +2429,13 @@ msgstr ""
 "O  ��� �������� ��� ����������� ��������.\n"
 "Q  ��� �� ����������� �� ���������� ��������."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
 "���������."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2510,12 +2507,12 @@ msgstr ""
 "\n"
 "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2523,11 +2520,11 @@ msgstr ""
 "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
 "�� user ID.  ��� �� ������������� �� ������ ����!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2538,7 +2535,7 @@ msgstr ""
 "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
 "������������� ��� ����."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2550,7 +2547,7 @@ msgstr ""
 "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
 "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2558,7 +2555,7 @@ msgstr ""
 "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
 "���������� ���."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2572,7 +2569,7 @@ msgstr ""
 "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
 "������ ���� ��� ����� ������ � ������� ��� �������."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2582,23 +2579,23 @@ msgstr ""
 "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
 "����-��������� �� ������� ���� 1 ������������.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2606,7 +2603,7 @@ msgstr ""
 "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
 "�� ��'������� ������ (������������� ���� �������) �� ��������������."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2634,7 +2631,7 @@ msgstr ""
 "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
 "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2645,536 +2642,536 @@ msgstr ""
 "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
 "����� �� �������.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "�� ��������������� ������� ������"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3187,63 +3184,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3252,11 +3249,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3265,12 +3262,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3279,43 +3276,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3323,11 +3320,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3337,32 +3334,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3371,21 +3368,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -3393,14 +3390,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3408,65 +3405,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3474,219 +3471,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3694,242 +3691,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3937,19 +3934,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3957,7 +3954,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3966,75 +3963,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4044,38 +4041,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4083,346 +4080,346 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4438,7 +4435,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4454,40 +4451,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4495,12 +4492,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4517,44 +4514,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4565,7 +4562,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4580,23 +4577,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4604,12 +4601,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4621,7 +4618,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4633,50 +4630,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4687,12 +4684,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4700,7 +4697,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4708,679 +4705,679 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "����     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�� ������ `%s' ������� ���. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ������� ��������\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5392,24 +5389,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5419,17 +5416,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5443,160 +5440,160 @@ msgstr ""
 "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
 "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ��� ����� JPEG ������\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "����� ���� � ���������� ����� (y/N/q); "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "����� ��� ��������:"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "������ ���������:"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = ��� ����\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d =  ��� ��� �����������\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = ���� ��� ������ �����\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "���� �� ������ ������ �� ����\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5608,115 +5605,115 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
 "���������)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5724,179 +5721,179 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "���� �������� ���:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5915,126 +5912,126 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
 "�������� ��������\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "������������� ������� ������ - ��������� �����������\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
 "�����������\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6042,7 +6039,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6050,54 +6047,54 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
 "����)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6105,7 +6102,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6114,23 +6111,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6138,53 +6135,53 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6193,350 +6190,350 @@ msgstr ""
 "# ����� ��� ������������ ����� ������������, ������������� %s\n"
 "# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "�������� ��� ����� ������������"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "������ ���� ������ ��� �������� ������������: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "������ ���������: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ������������� �� ������ trustdb\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�������� �������� ��� �������� ������������.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6546,146 +6543,140 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6693,382 +6684,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "���� �������������"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "������ ��������� ���: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���� �� ������ ���� �����!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "���������� ��� fingerprint"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "���������� ���� ���������"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "���|���"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "�������"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7080,307 +7071,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7391,137 +7382,127 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? �������� ���� ������ ���������: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7532,13 +7513,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7546,247 +7527,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "�������� ����� ���� %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "���� �������� ��� \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                ������ ��� \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "�����������"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "� ������ ����� ���� ������\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�����: gpg [��������] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "��� ������� �� ������� ������"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -7796,7 +7781,7 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7806,167 +7791,181 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "���������������� OK\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "���������������� OK\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [����� �������]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
diff --git a/po/eo.po b/po/eo.po
index 14e8d5490..66f926f05 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -14,155 +14,155 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,40 +173,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,342 +216,347 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +569,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +579,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -586,250 +591,250 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: uzanto ne trovita\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 #, fuzzy
 msgid "yes"
 msgstr "jes"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "ne"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "fini"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "k"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -838,206 +843,198 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1045,442 +1042,442 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "neuzebla sekreta �losilo"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1488,133 +1485,133 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1624,47 +1621,47 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1672,7 +1669,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1692,15 +1689,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1710,7 +1707,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1718,595 +1715,595 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2316,7 +2313,7 @@ msgstr ""
 "al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
 "rilatas al la (implicite kreita) atestilo-reto."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2328,18 +2325,18 @@ msgstr ""
 "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
 "absolute fidata\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2353,23 +2350,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Donu la �losilgrandon"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" a� \"ne\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2381,19 +2378,19 @@ msgstr ""
 "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la �losilposedanto"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2407,11 +2404,11 @@ msgstr ""
 "B  por da�rigi kun la �losilkreado.\n"
 "F  por interrompi la �losilkreadon kaj fini."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Respondu per \"jes\" (a� nur \"j\"), se la sub�losilo estu kreita."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2481,12 +2478,12 @@ msgstr ""
 "\n"
 "Se vi ne scias la �ustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2494,11 +2491,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
 "Tiam anka� �iuj atestiloj perdi�os!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Respondu per \"jes\", se la sub�losilo estu forvi�ita"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2508,7 +2505,7 @@ msgstr ""
 "�i tiun subskribon, �ar eble �i estos grava por establi fido-ligon\n"
 "al la �losilo a� al alia �losilo atestita per �i tiu �losilo."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2520,7 +2517,7 @@ msgstr ""
 "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
 "fido-ligon tra alia jam atestita �losilo."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2528,7 +2525,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi �in de\n"
 "via �losilaro."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2542,7 +2539,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -2553,24 +2550,24 @@ msgstr ""
 "al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
 "mem-subskriboj estos anta�enigitaj je unu sekundo.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2578,7 +2575,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2606,7 +2603,7 @@ msgstr ""
 "      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
 "      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2616,525 +2613,525 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "neuzebla sekreta �losilo"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3147,64 +3144,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3215,7 +3212,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -3224,7 +3221,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3235,12 +3232,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3251,7 +3248,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -3260,53 +3257,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3315,31 +3312,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3348,98 +3345,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3447,11 +3444,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3459,207 +3456,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3667,266 +3664,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3935,75 +3932,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -4013,380 +4010,380 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4402,7 +4399,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4418,40 +4415,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4459,12 +4456,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4480,44 +4477,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4528,7 +4525,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4543,23 +4540,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4567,12 +4564,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4584,7 +4581,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4596,50 +4593,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4648,12 +4645,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4661,7 +4658,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4669,682 +4666,682 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5355,24 +5352,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5382,17 +5379,17 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5401,164 +5398,164 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 #, fuzzy
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5570,111 +5567,111 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5682,182 +5679,182 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5868,122 +5865,122 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "malforta �losilo kreita - provas denove\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5991,7 +5988,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5999,50 +5996,50 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6050,7 +6047,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6059,421 +6056,421 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6483,146 +6480,140 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6630,391 +6621,391 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "legas opciojn el '%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "ne"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "nekonata versio"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7025,307 +7016,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7336,137 +7327,127 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Bona atestilo"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7477,13 +7458,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7491,247 +7472,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "            alinome \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -7741,7 +7726,7 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7751,166 +7736,179 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "mal�ifrado sukcesis\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "mal�ifrado sukcesis\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [dosiero]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: uzanto ne trovita: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
+
+#, fuzzy
 #~ msgid ".\n"
 #~ msgstr "%s.\n"
 
diff --git a/po/es.po b/po/es.po
index e67d73085..f59030216 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -18,49 +18,49 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -74,7 +74,7 @@ msgstr "MPI incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -88,102 +88,102 @@ msgstr "Frase contrase�a incorrecta"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Administrador"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita este PIN: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -194,40 +194,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduzca frase contrase�a\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -237,286 +237,291 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "busca claves en un servidor de claves"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza la base de datos de confianza"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no se puede crear el directorio: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -532,57 +537,57 @@ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -595,7 +600,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -605,7 +610,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -617,246 +622,246 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "s�"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usuario no encontrado\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "s�"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "fin"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "vale|Vale"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "cancelar|Cancelar"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "vV"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -864,194 +869,186 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1062,218 +1059,218 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�Eliminar esta clave del anillo? (s/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "borrada informaci�n de propietarios\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1281,7 +1278,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1290,197 +1287,197 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "llamadas a programas externos inhabilitadas por permisos inseguros de "
 "ficheros.\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
 "externos\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no se puede ejecutar el programa `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no se puede ejecutar el int�rprete de �rdenes `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "error del sistema llamando al programa externo: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finaliz� anormalmente\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "no se puede ejecutar el programa externo\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no se puede leer la respuesta del programa externo: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "clave secreta inutilizable"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
@@ -1489,7 +1486,7 @@ msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1497,132 +1494,132 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1632,43 +1629,43 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1676,7 +1673,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1684,7 +1681,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1704,15 +1701,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1722,7 +1719,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1730,71 +1727,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1802,18 +1799,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1821,446 +1818,446 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2268,23 +2265,23 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -2292,19 +2289,19 @@ msgstr "tomar las claves de este anillo"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2312,7 +2309,7 @@ msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "Confrontar las firmas contra claves conocidas\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2322,7 +2319,7 @@ msgstr ""
 "terceros. Es necesario para implementar la red de confianza, no tiene nada\n"
 "que ver con la red de certificados (impl�citamente creada)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2334,16 +2331,16 @@ msgstr ""
 "puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
 "clave se considere como de total confianza\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2366,7 +2363,7 @@ msgstr ""
 "\n"
 "La primera clave (clave primaria) debe ser siempre de tipo capaz de firmar."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2376,16 +2373,16 @@ msgstr ""
 "cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
 "Por favor consulte primero a un experto en seguridad."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2397,21 +2394,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
 "recomendable)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2425,11 +2422,11 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2504,11 +2501,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2516,11 +2513,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2530,7 +2527,7 @@ msgstr ""
 "borrar esta firma ya que puede ser importante para establecer una conexi�n\n"
 "de confianza con la clave o con otra clave certificada por �sta."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2542,13 +2539,13 @@ msgstr ""
 "se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
 "a trav�s de otra clave certificada."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2561,7 +2558,7 @@ msgstr ""
 "volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
 "es v�lida por alguna raz�n y hay otra disponible."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2571,25 +2568,25 @@ msgstr ""
 "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"s�\" para sobreescribir el fichero"
 
 # Sugerencia: ENTER -> INTRO.
 # Aceptada.
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2597,7 +2594,7 @@ msgstr ""
 "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el fichero\n"
 "por omisi�n (mostrado entre corchetes)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2626,7 +2623,7 @@ msgstr ""
 "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
 "      direcci�n de correo-e como inv�lida.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2636,529 +2633,529 @@ msgstr ""
 "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
 "Una l�nea vac�a pone fin al texto.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "clave secreta inutilizable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3170,17 +3167,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3190,46 +3187,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3238,11 +3235,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3251,11 +3248,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3264,43 +3261,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3308,11 +3305,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3322,31 +3319,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3355,76 +3352,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3432,11 +3429,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3444,187 +3441,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3635,226 +3632,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3862,17 +3859,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3880,7 +3877,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3889,75 +3886,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3966,364 +3963,364 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4339,7 +4336,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4355,38 +4352,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4394,11 +4391,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4414,44 +4411,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4462,7 +4459,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4479,23 +4476,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4503,12 +4500,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4520,7 +4517,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4533,50 +4530,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4584,12 +4581,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4597,7 +4594,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4605,667 +4602,667 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Servidor de claves cr�tico preferido: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5276,24 +5273,24 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5302,17 +5299,17 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5326,113 +5323,113 @@ msgstr ""
 "Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
 "Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Imposible abrir fichero JPEG `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "raz�n para la revocaci�n: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "comentario a la revocaci�n: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "No hay confianza definida para:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
 "que se nombra?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No lo s� o prefiero no decirlo\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO tengo confianza\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = conf�o absolutamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = volver al men� principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = saltar esta clave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = salir\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5441,41 +5438,41 @@ msgstr ""
 "El m�nimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "�Su decisi�n? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: No hay seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5485,110 +5482,110 @@ msgstr ""
 "identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
 "puede contestar s� a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5596,176 +5593,176 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %s caduc� el %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Ser� revocado por:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocaci�n confidencial)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5784,121 +5781,121 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
 "proteger la clave secreta.\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5906,7 +5903,7 @@ msgstr ""
 "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5914,51 +5911,51 @@ msgstr ""
 "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5966,7 +5963,7 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5975,23 +5972,23 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5999,48 +5996,48 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6049,338 +6046,338 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada %s\n"
 "# (Use \"gpg --import-ownertrust\" para restablecerlos)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "l�nea demasiado larga"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "falta una coma"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "huella dactilar no v�lida"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "falta el valor de confianza"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error econtrando registro de confianza en `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no se puede crear el bloqueo para `%s'\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "no se puede bloquear `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 "con el modelo de confianza `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6388,14 +6385,14 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "no se puede actualizar el registro de la versi�n de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6405,146 +6402,140 @@ msgstr ""
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creaci�n: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6554,386 +6545,386 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa la terminal en absoluto"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ver �rdenes de administrador"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "no se permite exportar claves secretas\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Clave disponible en: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Huella dactilar CA:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[no establecido]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6944,251 +6935,251 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "certificado duplicado - eliminado"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certificado duplicado - eliminado"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lista claves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea una salida ascii con armadura"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7198,60 +7189,60 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7262,137 +7253,127 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "el agente gpg no esta disponible en esta sesi�n\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Por favor seleccione tipo de clave que generar:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correcto"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7403,13 +7384,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7417,248 +7398,252 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Firmado el %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma correcta de \"%s\""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fin"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "l�nea demasiado larga"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opciones] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "Clave p�blica no encontrada"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "No se permiten �rdenes de administrador\n"
@@ -7672,7 +7657,7 @@ msgstr "error escribiendo anillo `%s': %s\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7682,166 +7667,179 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nombre_fichero]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "error en `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usuario no encontrado: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Por favor seleccione tipo de clave que generar:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
diff --git a/po/et.po b/po/et.po
index 8cf160a7d..dbb4da519 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -14,154 +14,154 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,40 +172,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Kasutan seda v�tit ikka? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,342 +215,347 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +568,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +578,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -585,248 +590,248 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[Kasutaja id puudub]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "jah"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "ei"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "v�lju"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "vV"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -834,205 +839,197 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1040,244 +1037,244 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "omaniku usalduse info puhastatud\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan �iffrit %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1285,209 +1282,209 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "v�liste programmide k�ivitamine on blokeeritud, kuna seadete failil on\n"
 "ebaturvalised �igused\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "v�line programm l�petas erandlikult\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "v�list programmi ei �nnestu k�ivitada\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "mittekasutatav salajane v�ti"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1495,133 +1492,133 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1631,47 +1628,47 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1679,7 +1676,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1699,15 +1696,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1717,7 +1714,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1725,578 +1722,578 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2304,7 +2301,7 @@ msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
 "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2313,7 +2310,7 @@ msgstr ""
 "Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
 "kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2325,17 +2322,17 @@ msgstr ""
 "on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
 "m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2349,7 +2346,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2359,16 +2356,16 @@ msgstr ""
 "kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
 "Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2380,19 +2377,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2406,11 +2403,11 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2481,12 +2478,12 @@ msgstr ""
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2494,11 +2491,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2508,7 +2505,7 @@ msgstr ""
 "kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
 "antud v�tmega sertifitseeritud teise v�tme usaldatavust."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2520,13 +2517,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2540,7 +2537,7 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2550,23 +2547,23 @@ msgstr ""
 "vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
 "ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2574,7 +2571,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2603,7 +2600,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2613,530 +2610,530 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "mittekasutatav salajane v�ti"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3149,63 +3146,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3214,11 +3211,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3227,11 +3224,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3240,54 +3237,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3297,32 +3294,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3331,100 +3328,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3432,11 +3429,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3444,206 +3441,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3651,241 +3648,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3893,19 +3890,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3913,7 +3910,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3922,75 +3919,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3999,375 +3996,375 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4383,7 +4380,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4399,40 +4396,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4440,12 +4437,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4461,44 +4458,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4509,7 +4506,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4524,23 +4521,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4548,12 +4545,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4565,7 +4562,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4577,50 +4574,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4630,690 +4627,690 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5324,24 +5321,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5351,17 +5348,17 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5375,158 +5372,158 @@ msgstr ""
 "v�ga suurt pilti, on ka k�ti v�ha suur!\n"
 "M�istlik pildi suurus v�iks olla umbes 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "t�histamise p�hjus: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "t�histamise kommentaar: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " t = tagasi p�himen��sse\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "See v�ti kuulub meile\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5538,109 +5535,109 @@ msgstr ""
 "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5648,180 +5645,180 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "T�histaja:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik t�histamise v�ti)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5842,174 +5839,174 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "loodi n�rk v�ti - proovin uuesti\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6017,7 +6014,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6026,74 +6023,74 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6102,347 +6099,347 @@ msgstr ""
 "# Omistatud usalduse v��rtuste loend, loodud: %s\n"
 "# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "rida on liiga pikk\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "viga usalduse kirje otsimisel: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6452,146 +6449,140 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6599,382 +6590,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "V�tme leiate: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "See v�ti on aegunud!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "n�ita s�rmej�lge"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "ei"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "tundmatu"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6985,307 +6976,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7296,137 +7287,127 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7437,13 +7418,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7451,247 +7432,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                 ka \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "v�lju"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku v�tit"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -7701,7 +7686,7 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7711,167 +7696,180 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [failinimi]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
diff --git a/po/fi.po b/po/fi.po
index e5efcc41d..4a5394ea7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -30,154 +30,154 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -188,40 +188,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -231,343 +231,348 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -580,7 +585,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -590,7 +595,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -602,242 +607,242 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "ei"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "lLsS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -845,7 +850,7 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -853,205 +858,197 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1059,454 +1056,454 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Poista tämä avain avainrenkaasta? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tämä on salainen avain! - poista varmasti? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "luottamustiedot pyyhitty\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
 "asetustiedoston oikeuksista\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1514,133 +1511,133 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1650,47 +1647,47 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1699,7 +1696,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1718,16 +1715,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1737,7 +1734,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1745,579 +1742,579 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2325,7 +2322,7 @@ msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
 "Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2336,7 +2333,7 @@ msgstr ""
 "luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
 "varmenneverkkojen kanssa."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2348,18 +2345,18 @@ msgstr ""
 "salainen \n"
 "pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä epäluotettavaa\n"
 "avainta."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2373,7 +2370,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2384,16 +2381,16 @@ msgstr ""
 "ympäristöissä.\n"
 "Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Syötä avaimen koko"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastaa \"kyllä\" tai \" ei\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2405,19 +2402,19 @@ msgstr ""
 "mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
 "vaan järjestelmä yrittää tulkita arvon aikajaksona."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Anna avaimen haltijan nimi"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Kirjoita vapaaehtoinen huomautus"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2431,11 +2428,11 @@ msgstr ""
 "O   jatka avaimen luomista\n"
 "L   lopeta"
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2506,12 +2503,12 @@ msgstr ""
 "\n"
 "Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2519,11 +2516,11 @@ msgstr ""
 "Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
 "Menetät samalla kaikki siihen liittyvät varmenteet!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2534,7 +2531,7 @@ msgstr ""
 "luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
 "varmentamaan avaimeen."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2547,7 +2544,7 @@ msgstr ""
 "avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
 "varmennetun avaimen kautta."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2555,7 +2552,7 @@ msgstr ""
 "Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
 "avainrenkaastasi."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2569,7 +2566,7 @@ msgstr ""
 "allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
 "avaimella on jo toinen allekirjoitus."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2579,23 +2576,23 @@ msgstr ""
 "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Anna allekirjoitetun tiedoston nimi"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2603,7 +2600,7 @@ msgstr ""
 "Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
 "oletustiedostoa (joka näkyy sulkeissa)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2632,7 +2629,7 @@ msgstr ""
 "      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
 "vanhenneeksi.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2642,534 +2639,534 @@ msgstr ""
 "mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
 "Tyhjä rivi päättää tekstin.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Ei ohjeita saatavilla"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3182,63 +3179,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3247,13 +3244,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3262,11 +3259,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3275,55 +3272,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3332,32 +3329,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3366,100 +3363,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3467,11 +3464,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3479,206 +3476,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3686,241 +3683,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3928,19 +3925,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3948,7 +3945,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3957,75 +3954,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4035,379 +4032,379 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4423,7 +4420,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4439,40 +4436,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4480,12 +4477,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4503,44 +4500,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4551,7 +4548,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4566,23 +4563,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4590,12 +4587,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4607,7 +4604,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4619,50 +4616,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4671,12 +4668,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4684,7 +4681,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4692,682 +4689,682 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Tiedosto \"%s\" on olemassa."
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tuntematon pääte\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Syötä uusi tiedostonimi"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5378,24 +5375,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5404,17 +5401,17 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5429,162 +5426,162 @@ msgstr ""
 "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
 "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMlLoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Luottamusarvoa ei ole asetettu seuraavalle:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = En tiedä\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EN luota\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Luotan ehdottomasti\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = takaisin päävalikkoon\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = ohita tämä avain\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " l = lopeta\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Valintasi? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5596,114 +5593,114 @@ msgstr ""
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5711,179 +5708,179 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Mitätöinnin tekee:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5903,120 +5900,120 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Salasana ei kelpaa; yritä uudestaan"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "luotu avain on heikko - yritän uudestaan\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
 "yritettiin %d kertaa!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6024,7 +6021,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6032,57 +6029,57 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -tyyliset)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROITUS: %%-laajennus ei onnistu (liian suuri).  Käytetään "
 "laajentamatonta.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
 "tyyliset)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6090,7 +6087,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6099,77 +6096,77 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6178,348 +6175,348 @@ msgstr ""
 "# Luettelo annettuista luottamusarvoista, luotu %s\n"
 "# (Käytä \"gpg --import-ownertrust\" palauttaaksesi ne)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "rivi on liian pitkä\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "tuo luottamusasteet"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "virhe etsittäessä luottamustietuetta: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6529,147 +6526,141 @@ msgstr ""
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6677,383 +6668,383 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "ei"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "tuntematon "
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7064,307 +7055,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "käytä oletusavainta oletusvastaanottajana"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "käytä aina v3-allekirjoituksia"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "käytä aina MDC:tä salaamiseen"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7375,137 +7366,127 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Valitse millaisen avaimen haluat:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7516,13 +7497,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7530,247 +7511,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -7780,7 +7765,7 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7790,167 +7775,180 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "avaus onnistui\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [tiedostonimi]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tiedostoa %s ei voi avata: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Valitse millaisen avaimen haluat:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
diff --git a/po/fr.po b/po/fr.po
index 45de9e410..17718407e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,157 +19,157 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|code PIN d'administration"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "R�p�tez ce code PIN: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -180,17 +180,17 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Entrez la phrase de passe\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
@@ -198,23 +198,23 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -224,348 +224,353 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -578,7 +583,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -588,7 +593,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -600,114 +605,114 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[Nom utilisateur introuvable]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
@@ -715,136 +720,136 @@ msgstr ""
 "peu s�res\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "oui"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "oO"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "non"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quitter"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "ok|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "annuler|annuler"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "aA"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -852,195 +857,187 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1051,224 +1048,224 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans � --yes �\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Enlever cette cl� du porte-cl�s ? (o/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "C'est une cl� secr�te ! - faut-il vraiment l'effacer ? (o/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "les informations de confiance au propri�taires ont �t� effac�es\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1276,7 +1273,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1285,213 +1282,213 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les appels aux programmes externes sont d�sactiv�s car les permissions\n"
 "du fichier d'options sont trop peu s�res\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossible d'ex�cuter l'int�rpr�teur de commandes `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erreur syst�me pendant l'appel du programme externe: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "impossible d'ex�cuter le programme externe\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossible de lire la r�ponse du programme externe: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
 "(%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nettoyer les parties inutilisables de la cl�"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-cl� %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1499,132 +1496,132 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1634,47 +1631,47 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1682,7 +1679,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1702,17 +1699,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1722,7 +1719,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1730,85 +1727,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1816,21 +1813,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1838,504 +1835,504 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2343,7 +2340,7 @@ msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
 "Verifier des signatures avec des cl�s de confiance connues\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2354,7 +2351,7 @@ msgstr ""
 "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
 "certificats (cr�� implicitement)"
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2366,18 +2363,18 @@ msgstr ""
 "en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
 "\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
 "le message."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2402,7 +2399,7 @@ msgstr ""
 "La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
 "de signer."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2413,16 +2410,16 @@ msgstr ""
 "pour certains domaines.\n"
 "Consultez votre expert en s�curit� d'abord."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2434,19 +2431,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2460,11 +2457,11 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2531,11 +2528,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2543,11 +2540,11 @@ msgstr ""
 "R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
 "d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2558,7 +2555,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2570,7 +2567,7 @@ msgstr ""
 "vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
 "peut �tablir une connection de confiance vers une autre cl� d�j� certifi�e."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2578,7 +2575,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2592,7 +2589,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2602,25 +2599,25 @@ msgstr ""
 "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "R�p�tez la derni�re phrase de passe pour �tre s�r de ce que vous\n"
 "avez tap�."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2628,7 +2625,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
 "fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2657,7 +2654,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2667,536 +2664,536 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "nettoyer les parties inutilisables de la cl�"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "          signatures nettoy�es: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "ressource bloc de cl�s `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3208,17 +3205,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3228,47 +3225,47 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3277,11 +3274,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3290,13 +3287,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3305,43 +3302,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3349,11 +3346,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3363,31 +3360,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3396,92 +3393,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3490,198 +3487,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3693,158 +3690,158 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3852,73 +3849,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3926,17 +3923,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3945,7 +3942,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3955,75 +3952,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4033,380 +4030,380 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4422,7 +4419,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4438,38 +4435,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4477,11 +4474,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4497,44 +4494,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4545,7 +4542,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4561,23 +4558,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4586,12 +4583,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4605,7 +4602,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4617,52 +4614,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4671,13 +4668,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4685,7 +4682,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4693,510 +4690,510 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "jamais    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de cl�s critique favori: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -5204,180 +5201,180 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental � cl�\n"
 "publique %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental de chiffrement\n"
 "%s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " nouveau fichier de configuration `%s' cr��\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5389,24 +5386,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez la phrase de passe\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5415,17 +5412,17 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5440,113 +5437,113 @@ msgstr ""
 "en sera de m�me pour votre cl� !\n"
 "La meilleure taille � utiliser est 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ce JPEG est vraiment tr�s grand (%d octets) !\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�tes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' n'est pas un fichier JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "cause de r�vocation: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "commentaire de r�vocation: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Pas de valeur de confiance d�finie pour :\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias � %s �\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Jusqu'� quel point avez-vous confiance au fait que cette cl�\n"
 "appartient r��llement � l'utilisateur nomm� ?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = ne sais pas ou ne dirai pas\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = je ne fais PAS confiance\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = je donne une confiance ultime\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = retour au menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = quitter\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5555,41 +5552,41 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ? (o/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Rien ne dit que la cl� appartient vraiment � l'utilisateur\n"
 "nomm�.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Il n'est pas vraiment s�r que la cl� appartient vraiment\n"
 "� l'utilisateur nomm�.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Cette cl� appartient probablement � l'utilisateur nomm�\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5600,115 +5597,115 @@ msgstr ""
 "vous pouvez r�pondre oui � la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISSEMENT: cette cl� est peut-�tre r�voqu�e (cl� de r�vocation\n"
 "absente)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "R�cipients actuels:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5716,180 +5713,180 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par d�faut � %s � inconnu\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
 "dans les pr�f�rences du destinataire\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Doit �tre r�voqu� par:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5909,124 +5906,124 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Phrase de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore la phrase de passe.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
 "la cl� secr�te\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "cl� faible g�n�r�e - nouvel essai\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s a un certificat crois�\n"
 "invalide\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6034,7 +6031,7 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu seconde dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6042,62 +6039,62 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu secondes dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %s a expir� le %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre des donn�es de notation dans des signatures v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossible de mettres des donn�es de notation dans des signatures de\n"
 "cl�s v3 (de style PGP 2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
 "(cha�ne trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre une URL de politique dans des signatures v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible de mettre une URL de politique dans des signatures de cl� v3\n"
 "(de style PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6105,7 +6102,7 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6114,23 +6111,23 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6138,53 +6135,53 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "� %s � a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "� %s � a �t� ignor�: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
 "les signatures !"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6193,344 +6190,344 @@ msgstr ""
 "# Liste des valeurs de confiance assign�es, cr��e le %s\n"
 "# (Utilisez � gpg --import-ownertrust � pour les restaurer)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "ligne trop longue"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "symbole deux-points manquant"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "empreinte invalide"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "valeur de confiance au propri�taire manquante"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossible de cr�er un verrou pour `%s'\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossible de verrouiller `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cl� %s: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la cl� %s appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cl� %s: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cl� %s marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
 "on utilise � la place le mod�le de confiance %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "v�rification de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "mise � jour de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6538,14 +6535,14 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6555,152 +6552,146 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6710,378 +6701,378 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|code PIN d'administration"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cl� disponible sur: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Cette cl� a expir� !"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte de l'autorit� de certification: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "v�rifier une signature"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "non"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[non positionn�]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7093,320 +7084,320 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "v�rifier les signatures"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "algorithme de compression inconnu"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7417,141 +7408,131 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent n'est pas disponible dans cette session\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7562,13 +7543,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7576,248 +7557,252 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature faite le %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bonne signature de � %s �"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                alias � %s �"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quitter"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "utilisation: gpg [options] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "cl� publique non trouv�e"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
@@ -7827,7 +7812,7 @@ msgstr "Les commandes d'administration ne sont pas permises\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7837,166 +7822,179 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nom du fichier]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
diff --git a/po/gl.po b/po/gl.po
index b25e97f6e..e20e997f3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -14,155 +14,155 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,40 +173,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -216,346 +216,351 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -568,7 +573,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -578,7 +583,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -590,249 +595,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usuario non atopado\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "si|sim"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "non|nom"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "abandonar"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "v"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -840,205 +845,197 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1046,246 +1043,246 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�Borrar esta chave do chaveiro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "borrouse a informaci�n de confianza\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1294,208 +1291,208 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "as chamadas a programas externos est�n desactivadas debido a opci�ns de "
 "permisos de ficheiros non seguras\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erro do sistema ao chamar a un programa externo: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "sa�da non natural do programa externo\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "non se puido executar un programa externo\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "non se puido le-la resposta do programa externo: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta non utilizable"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1503,133 +1500,133 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1639,47 +1636,47 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1687,7 +1684,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1707,17 +1704,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1727,7 +1724,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1735,581 +1732,581 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2317,7 +2314,7 @@ msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
 "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2327,7 +2324,7 @@ msgstr ""
 "a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non ten\n"
 "nada que ver coa rede de certificados."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2338,16 +2335,16 @@ msgstr ""
 "confianza absoluta - esas adoitan se-las chaves das que ten acceso � chave\n"
 "secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2361,7 +2358,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2371,16 +2368,16 @@ msgstr ""
 "Este algoritmo deber�a empregarse s� en determinados dominios.\n"
 "Consulte antes co seu experto en seguridade."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2392,19 +2389,19 @@ msgstr ""
 "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
 "valor proporcionado coma se fora un intervalo."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2418,11 +2415,11 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2495,12 +2492,12 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2508,11 +2505,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2522,7 +2519,7 @@ msgstr ""
 "sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
 "confianza na chave ou noutra chave certificada por esta chave."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2534,13 +2531,13 @@ msgstr ""
 "se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
 "conexi�n de confianza mediante outra chave xa certificada."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2554,7 +2551,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2564,24 +2561,24 @@ msgstr ""
 "� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
 "afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2589,7 +2586,7 @@ msgstr ""
 "Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
 "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2617,7 +2614,7 @@ msgstr ""
 "     Empr�gueo para indicar que o ID de usuario xa non se deber�a empregar;\n"
 "     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2627,541 +2624,541 @@ msgstr ""
 "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
 "Unha li�a en branco remata o texto.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta non utilizable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3173,63 +3170,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3238,11 +3235,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3251,11 +3248,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3264,54 +3261,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3320,32 +3317,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3354,100 +3351,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3455,11 +3452,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3467,212 +3464,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3680,243 +3677,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3924,19 +3921,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3944,7 +3941,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3953,77 +3950,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4033,383 +4030,383 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4425,7 +4422,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4441,40 +4438,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4482,12 +4479,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4504,44 +4501,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4552,7 +4549,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4568,23 +4565,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4592,12 +4589,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4609,7 +4606,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4621,50 +4618,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4674,12 +4671,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4687,7 +4684,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4695,676 +4692,676 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "O ficheiro `%s' xa existe. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desco�ecido\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5375,24 +5372,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5402,17 +5399,17 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5426,160 +5423,160 @@ msgstr ""
 "p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
 "moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" non � un ficheiro JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�� esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "motivo para a revocaci�n: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "comentario de revocaci�n: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMsSoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non sei\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON conf�o\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao men� principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omitir esta chave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Esta chave pert�ncenos a n�s\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5591,114 +5588,114 @@ msgstr ""
 "respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5706,179 +5703,179 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificaci�n vella do DEK non est� soportada\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Ha ser revocada por:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5896,124 +5893,124 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
 "secreta\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "creouse unha chave feble - volvendo a tentalo\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6021,7 +6018,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6029,141 +6026,141 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
 "desco�ecido\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP 2."
 "x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
 "expandir.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo PGP 2."
 "x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6172,351 +6169,351 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada o %s\n"
 "# (Empregue \"gpg --import-ownertrust\" para restauralos)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "li�a longa de m�is\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro ao buscar un rexistro de confianza: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6526,149 +6523,143 @@ msgstr ""
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
 "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "axusta-los valores de depuraci�n"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "habilitar depuraci�n total"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6676,391 +6667,391 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispo�ible en: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "desco�ecido"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7071,307 +7062,307 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7382,137 +7373,127 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Por favor, seleccione o tipo de chave que quere:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correcto"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7523,13 +7504,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7537,248 +7518,252 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "               alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "li�a longa de m�is\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave p�blica"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -7788,7 +7773,7 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7798,169 +7783,182 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "descifrado correcto\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [ficheiro]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: non se atopou o usuario: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Por favor, seleccione o tipo de chave que quere:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
diff --git a/po/hu.po b/po/hu.po
index fd0e9cec9..6f8d8fe7b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -14,154 +14,154 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,40 +172,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�rja be a jelsz�t!\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,342 +215,347 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +568,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +578,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -585,248 +590,248 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[ismeretlen kulcs]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "igen"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "iI"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nem"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -834,205 +839,197 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1040,451 +1037,451 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelez�st haszn�lok.\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "A k�ls� programok h�v�sa tiltott, mert az \"options\" �llom�ny enged�lyei\n"
 "nem biztons�gosak.\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1492,133 +1489,133 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1628,47 +1625,47 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1676,7 +1673,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1696,15 +1693,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1714,7 +1711,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1722,579 +1719,579 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2302,7 +2299,7 @@ msgstr ""
 "Szintaxis: gpg [opci�k] [f�jlok]\n"
 "Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2312,7 +2309,7 @@ msgstr ""
 "nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
 "sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2324,18 +2321,18 @@ msgstr ""
 "melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
 "alapvet�en megb�zhat�nak jel�li!\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
 "v�laszoljon \"igen\"-nel!"
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2349,7 +2346,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2359,16 +2356,16 @@ msgstr ""
 "titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
 "haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Adja meg a kulcs m�ret�t!"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2380,19 +2377,19 @@ msgstr ""
 "hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
 "intervallumk�nt �rtelmezni."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2406,13 +2403,13 @@ msgstr ""
 "R  kulcsgener�l�s folytat�sa\n"
 "Q  kil�p�s a kulcsgener�l�sb�l"
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
 "l�trehoz�s�t!"
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2486,13 +2483,13 @@ msgstr ""
 "\n"
 "Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja �rni!"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2501,11 +2498,11 @@ msgstr ""
 "felhaszn�l�azonos�t�t!\n"
 "Minden igazol�s t�rl�dik vele egy�tt!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2515,7 +2512,7 @@ msgstr ""
 "t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
 "vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2527,13 +2524,13 @@ msgstr ""
 "hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
 "kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2547,7 +2544,7 @@ msgstr ""
 "a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
 "�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2557,23 +2554,23 @@ msgstr ""
 "tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
 "�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2581,7 +2578,7 @@ msgstr ""
 "K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
 "a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2609,7 +2606,7 @@ msgstr ""
 "      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
 "      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2619,533 +2616,533 @@ msgstr ""
 "adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
 "Egy �res sor jelzi a sz�veg v�g�t.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nem �ll rendelkez�sre seg�ts�g."
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3158,63 +3155,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3223,11 +3220,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3236,11 +3233,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3249,54 +3246,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3305,32 +3302,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3339,100 +3336,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3440,11 +3437,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3452,206 +3449,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3659,241 +3656,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3901,19 +3898,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3921,7 +3918,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3931,75 +3928,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4009,377 +4006,377 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4395,7 +4392,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4411,40 +4408,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4452,12 +4449,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4474,44 +4471,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4522,7 +4519,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4537,24 +4534,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4562,12 +4559,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4579,7 +4576,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4591,50 +4588,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4644,703 +4641,703 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "soha      "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritikus al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" �llom�ny l�tezik. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ismeretlen v�gz�d�s.\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "�rja be az �j �llom�nynevet"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5352,24 +5349,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5380,17 +5377,17 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5404,160 +5401,160 @@ msgstr ""
 "k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
 "A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG �llom�ny.\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fot� megfelel� (i/N/k)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "Visszavon�s oka: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "Megjegyz�s a visszavon�shoz: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iIfFkKhH"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nem tudom\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NEM b�zom benne\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = alapvet�en megb�zom benne\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " f = visszat�r�s a f�men�be\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " k = kil�p�s\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozz�nk tartozik.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5569,110 +5566,110 @@ msgstr ""
 "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5680,180 +5677,180 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Visszavonja:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5871,180 +5868,180 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "FIGYELEM: Gyenge kulcsot tal�ltam. K�rem, v�ltoztassa meg ism�t a jelsz�t!\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Elavult, 16 bites ellen�rz��sszeget hozok l�tre titkos kulcs v�delm�hez.\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
 "%d alkalommal pr�b�ltam!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6053,7 +6050,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6063,22 +6060,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6086,53 +6083,53 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
 "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6141,348 +6138,348 @@ msgstr ""
 "# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
 "# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "bizalmi �rt�kek importja"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: K�nyvt�r nem l�tezik!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6492,146 +6489,140 @@ msgstr ""
 "Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
 "kell az els� helyre �rni a parancssorban!\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6639,382 +6630,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs tal�lhat�: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Ez a kulcs lej�rt!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "nem"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "Ismeretlen m�d�"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7026,307 +7017,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7337,137 +7328,127 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7478,13 +7459,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7492,247 +7473,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "               azaz \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "kil�p�s|kilepes"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "A sor t�l hossz�!\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -7742,7 +7727,7 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7752,167 +7737,181 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "Visszafejt�s rendben.\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "Visszafejt�s rendben.\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [f�jln�v]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
diff --git a/po/id.po b/po/id.po
index 41170b3cc..f624207a1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -16,154 +16,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -174,40 +174,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -217,342 +217,347 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -565,7 +570,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -575,7 +580,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -587,249 +592,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[User id tidak ditemukan]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "y|ya"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "n|t|tidak"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -837,205 +842,197 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1043,450 +1040,450 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informasi ownertrust dihapus\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
 "pgp2\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
 "aman\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "tidak dapat mengeksekusi program eksternal\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1494,133 +1491,133 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1630,47 +1627,47 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1678,7 +1675,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1698,15 +1695,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1716,7 +1713,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1724,587 +1721,587 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2312,7 +2309,7 @@ msgstr ""
 "Sintaks: gpg [options] [files]\n"
 "Periksa signature terhadap kunci terpercaya\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2324,7 +2321,7 @@ msgstr ""
 "ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2336,16 +2333,16 @@ msgstr ""
 "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
 "sangat dipercaya\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2359,7 +2356,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2370,16 +2367,16 @@ msgstr ""
 "mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
 "Silakan berkonsultasi dulu dengan ahli keamanan anda."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2391,19 +2388,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2417,11 +2414,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2499,12 +2496,12 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2512,11 +2509,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2526,7 +2523,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2538,7 +2535,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2546,7 +2543,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2560,7 +2557,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2570,24 +2567,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2595,7 +2592,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2625,7 +2622,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2635,530 +2632,530 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "perbarui database trust"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3171,63 +3168,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3236,11 +3233,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3249,13 +3246,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3264,43 +3261,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3308,11 +3305,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3322,32 +3319,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3356,100 +3353,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3457,11 +3454,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3469,206 +3466,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3676,241 +3673,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3918,19 +3915,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3938,7 +3935,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3948,75 +3945,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4026,380 +4023,380 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4415,7 +4412,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4431,40 +4428,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4472,12 +4469,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4493,44 +4490,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4540,7 +4537,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4555,23 +4552,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4579,12 +4576,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4597,7 +4594,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4609,50 +4606,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4662,690 +4659,690 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5356,24 +5353,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5383,17 +5380,17 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5409,160 +5406,160 @@ msgstr ""
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Tidak tahu\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d: Saya TIDAK percaya\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = lewati kunci ini\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5574,110 +5571,110 @@ msgstr ""
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5685,178 +5682,178 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Akan dibatalkan oleh:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5876,181 +5873,181 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6058,7 +6055,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6067,76 +6064,76 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6145,347 +6142,347 @@ msgstr ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "baris terlalu panjang\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impor nilai ownertrust"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6495,147 +6492,140 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr ""
-"silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6643,382 +6633,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "tidak dikenal"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7029,307 +7019,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7340,137 +7330,127 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Silakan pilih kunci yang anda inginkan:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7481,13 +7461,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7495,247 +7475,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -7745,7 +7729,7 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7755,167 +7739,181 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "dekripsi lancar\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [namafile]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Silakan pilih kunci yang anda inginkan:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
diff --git a/po/it.po b/po/it.po
index 654336ce6..edbb8d083 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -14,154 +14,154 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripeti la passphrase: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,40 +172,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Uso lo stesso questa chiave? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Inserisci la passphrase\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -215,342 +215,347 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "errore di lettura: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +568,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +578,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -585,249 +590,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[User ID non trovato]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "si|s�"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -835,206 +840,198 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1042,241 +1039,241 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informazioni di fiducia del possessore cancellate\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
 "bit\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1284,7 +1281,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1293,209 +1290,209 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "le chiamate a programmi esterni sono disattivate a causa dei permessi non\n"
 "sicuri del file delle opzioni\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "errore di sistema chiamando il programma esterno: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "impossibile eseguire il programma esterno\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossibile leggere la risposta del programma esterno: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chiave segreta inutilizzabile"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1503,133 +1500,133 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1639,47 +1636,47 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1687,7 +1684,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1707,15 +1704,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1725,7 +1722,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1733,582 +1730,582 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2316,7 +2313,7 @@ msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
 "Controlla le firme con le chiavi affidabili note\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2326,7 +2323,7 @@ msgstr ""
 "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
 "con il web-of-certificates (creato implicitamente)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2339,16 +2336,16 @@ msgstr ""
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2362,7 +2359,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2373,16 +2370,16 @@ msgstr ""
 "campi.\n"
 "Per favore consulta prima il tuo esperto di sicurezza."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2394,19 +2391,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2420,11 +2417,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2503,12 +2500,12 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2516,11 +2513,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2531,7 +2528,7 @@ msgstr ""
 "questa firma perch� pu� essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2545,13 +2542,13 @@ msgstr ""
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2566,7 +2563,7 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2577,23 +2574,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2601,7 +2598,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2630,7 +2627,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
 "      solitamente � usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2640,533 +2637,533 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chiave segreta inutilizzabile"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3179,63 +3176,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3244,11 +3241,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3257,11 +3254,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3270,43 +3267,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3314,11 +3311,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3328,32 +3325,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3362,100 +3359,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3463,11 +3460,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3475,206 +3472,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3682,241 +3679,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3925,19 +3922,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3946,7 +3943,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3955,76 +3952,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4034,386 +4031,386 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4429,7 +4426,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4445,40 +4442,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4486,12 +4483,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4508,44 +4505,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4556,7 +4553,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4571,23 +4568,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4595,12 +4592,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4612,7 +4609,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4624,50 +4621,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4677,12 +4674,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4690,7 +4687,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4698,214 +4695,214 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4913,463 +4910,463 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creato un nuovo file di configurazione `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5380,24 +5377,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5407,17 +5404,17 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5434,160 +5431,160 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": non � un file JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto � giusta? (s/N/q) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non lo so\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON mi fido\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = salta questa chiave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5599,112 +5596,112 @@ msgstr ""
 "rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
 "non � presente).\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5712,180 +5709,180 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Revocabile da:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa � una chiave di revoca sensibile)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5905,126 +5902,126 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "genero il checksum a 16 bit deprecato per la protezione della chiave "
 "segreta\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
 "non valida\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6032,7 +6029,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6040,60 +6037,60 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
 "subchiave\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
 "PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6102,7 +6099,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6112,76 +6109,76 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6190,348 +6187,348 @@ msgstr ""
 "# Lista dei valori della fiducia assegnati, creata il %s\n"
 "# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "riga troppo lunga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa i valori di fiducia"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "errore cercando il record della fiducia: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "errore di lettura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6541,146 +6538,140 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6688,382 +6679,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chiave disponibile presso: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genera un certificato di revoca"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Questa chiave � scaduta!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra le impronte digitali"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "sconosciuto"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7074,307 +7065,307 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7385,137 +7376,127 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent non � disponibile in questa sessione\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genera un certificato di revoca"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7526,13 +7507,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7540,247 +7521,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Firma scaduta il %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma valida da \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riga troppo lunga\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "chiave pubblica non trovata"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -7790,7 +7775,7 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7800,167 +7785,180 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "decifratura corretta\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "decifratura corretta\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nomefile]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Per favore scegli che tipo di chiave vuoi:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
diff --git a/po/ja.po b/po/ja.po
index e51e3a562..c47d2cb61 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -17,154 +17,154 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "PIN�������: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,40 +175,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�ѥ��ե졼��������\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,342 +218,347 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +571,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +581,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -588,438 +593,430 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "yes"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1030,421 +1027,421 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��--yes�ɤΤʤ��Хå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "���θ����ؤ��������ޤ���? (y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? (y/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
 "�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "�����ץ�����ब���Լ����˽�λ\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�����ץ������α������ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1452,132 +1449,132 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1587,51 +1584,51 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1640,7 +1637,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1660,15 +1657,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1678,7 +1675,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1686,569 +1683,569 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2256,7 +2253,7 @@ msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
 "���Το��Ѥ������ǽ�̾�򸡺�\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2266,7 +2263,7 @@ msgstr ""
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2278,16 +2275,16 @@ msgstr ""
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
 "��yes�ɤ������Ƥ���������\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2310,7 +2307,7 @@ msgstr ""
 "\n"
 "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2320,16 +2317,16 @@ msgstr ""
 "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
 "�ޤ����������ƥ���������Ȥˤ����̤���������"
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2341,19 +2338,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
 "����褦�˻�ߤޤ���"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2367,11 +2364,11 @@ msgstr ""
 "O  ��������³�ԡ�\n"
 "Q  �������ν�λ��"
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2440,11 +2437,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2452,11 +2449,11 @@ msgstr ""
 "���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
 "�����������Ʊ���˾õ�ޤ�!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2466,7 +2463,7 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2478,7 +2475,7 @@ msgstr ""
 "�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
 "���⤷��ʤ�����Ǥ���"
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2486,7 +2483,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2499,7 +2496,7 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2508,23 +2505,23 @@ msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2532,7 +2529,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
 "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2561,7 +2558,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2571,526 +2568,526 @@ msgstr ""
 "ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3101,17 +3098,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3120,46 +3117,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3168,11 +3165,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3181,11 +3178,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3194,53 +3191,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3249,32 +3246,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3283,75 +3280,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3359,11 +3356,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3372,206 +3369,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3579,159 +3576,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3739,71 +3736,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3811,17 +3808,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3829,7 +3826,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3838,75 +3835,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3915,364 +3912,364 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4288,7 +4285,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4304,40 +4301,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4345,11 +4342,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4365,44 +4362,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4413,7 +4410,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4428,23 +4425,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4452,12 +4449,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4469,7 +4466,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4480,50 +4477,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4532,677 +4529,677 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "̵����    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "����������������: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ̤�Τγ�ĥ��\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5213,24 +5210,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5239,17 +5236,17 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5263,149 +5260,149 @@ msgstr ""
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
 "�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG�ե������%s�פ������ޤ���: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "����JPEG�ϡ��������礭�� (%d�Х���) !\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "������ͳ: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "����������: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "�����٤����ꤵ��Ƥ��ޤ���:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  ��̾��%s��\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "���θ������Υ桼������ʤΤ��ܿͤΤ�Τ��ɤ������ɤ줯�餤���ѤǤ��ޤ���?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = �Τ�ʤ����ޤ��ϲ��Ȥ�����ʤ�\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = ���Ѥ� �ʤ�\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = ����Ū�˿��Ѥ���\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = �᡼�󡦥�˥塼�����\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = ��λ\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ�����������������������ޤ���\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5415,105 +5412,105 @@ msgstr ""
 "�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5521,178 +5518,178 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ����ѶػߤǤ�\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "�ٹ�: �Ź楢�르�ꥺ��%s�ϼ���ͤ����������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "������:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5710,243 +5707,243 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "�ٹ�: ̵������߾���������̾����%s�ˤ���ޤ�\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ��%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5955,348 +5952,348 @@ msgstr ""
 "# Sitei sareta sin'youdo itiran %s\n"
 "# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "�����󤬤���ޤ���"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "̵���ʻ���"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "��ͭ�Կ����٤�����ޤ���"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "��%s�פΥ��å�������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "��%s: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "��%s�����ѥǡ����١�����ʣ������ޤ�\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "��%s: ���Ѥ���븰�θ�����������ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "��%s������Ū�˿��Ѥ���褦��Ͽ���ޤ���\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȷ�%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6306,146 +6303,140 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
@@ -6453,376 +6444,376 @@ msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������������"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA���: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "��̾�򸡾�"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[̤����]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6833,316 +6824,316 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "����������������\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��̾�μ���"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7153,137 +7144,127 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "�������븰�η������򤷤Ƥ�������:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "���������������"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7294,13 +7275,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7308,246 +7289,250 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "��%s�ɤ������������̾"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                ��̾��%s��"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
@@ -7557,7 +7542,7 @@ msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7567,166 +7552,179 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "���������\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "���������\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [�ե�����̾]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "�������븰�η������򤷤Ƥ�������:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
diff --git a/po/nb.po b/po/nb.po
index 68cf97263..780abf438 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -18,153 +18,153 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Gjenta denne PIN: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,40 +175,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Tast inn passfrase\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,338 +218,342 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -562,7 +566,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -572,7 +576,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -584,433 +588,425 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[Brukerid ikke funnet]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ja"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nei"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "avslutt"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "ugyldig armorheader: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "armorheader: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "ugyldig clearsigheader\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "n�stede klartekstsignaturer\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "uforventet armering:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "misdannet CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "feil i trailerlinje\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1021,220 +1017,220 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(med mindre du angir n�kkelen ved hjelp av fingeravtrykk)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan ikke gj�re dette i batchmode uten �--yes�\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dette er en hemmelig n�kkel! - virkelig slette den? (j/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "nullstilt informasjon om eiertillit\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan ikke bruke en symmetrisk ESK-pakke p� grunn av S2K-modusen\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruker cipher %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan bare kryptere med RSA-n�kler med lengder p� 2048 bits eller mindre i "
 "--pgp2-modus\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leser fra �%s�\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "klarte ikke � bruke IDEA-algoritmen for alle n�klene du krypterer til.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1242,7 +1238,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1251,197 +1247,197 @@ msgstr ""
 "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
 "cipher.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved h�ndtering av kryptert pakke\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "eksterne programkall er utkoblet p� grunn av utrygge rettigheter p� "
 "konfigurasjonsfila\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "denne plattformen krever midlertidige filer ved kall p� eksterne programmer\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunne ikke utf�re program �%s�: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunne ikke utf�re skallet �%s�: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfeil under kall p� eksternt program: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig avslutning av eksternt program\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "klarte ikke � kj�re eksternt program\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "klarte ikke � lese reponsen fra eksternt program: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig fil (%s) �%s�: %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "eksportere signaturer som er markert som bare-lokale"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�kkel %s: ikke beskyttet - hoppet over\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "klarte ikke � fjerne beskyttelsen p� undern�kkelen: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "for mange innslag i pk-cachen - utkoblet\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[Brukerid ikke funnet]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1449,132 +1445,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1584,47 +1580,47 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1632,7 +1628,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1652,15 +1648,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1670,7 +1666,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1678,73 +1674,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1752,20 +1748,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1773,476 +1769,476 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2250,14 +2246,14 @@ msgstr ""
 "Bruksm�te: gpgv [valg] [filer]\n"
 "Sjekke signaturer mot kjente betrodde n�kler\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2265,16 +2261,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2288,23 +2284,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2312,19 +2308,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2333,11 +2329,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2405,28 +2401,28 @@ msgstr ""
 "\n"
 "Svar �0� dersom du ikke vet hva det riktige svaret er."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2434,13 +2430,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2449,36 +2445,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr ""
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2494,528 +2490,528 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr ""
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr ""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr ""
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�kler behandlet hittil\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nye n�kler som ble hoppet over: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "               uten brukerider: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importert: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       uendret: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                nye brukerider: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nye undern�kler: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                nye signaturer: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         nye n�kkelopphevinger: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "        leste hemmelige n�kler: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importerte hemmelige n�kler: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  uforandrede hemmelige n�kler: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                ikke importert: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         oppryddete signaturer: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "         oppryddete brukerider: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         �%s� preferanse for digestalgoritme %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�kkel %s: ingen gyldig brukerid\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende selvsignatur\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�kkel %s: �%s� 1 ny signatur\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�kkel %s: �%s� ikke endret\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "n�kkel %s: hemmelig n�kkel importert\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�kkel %s: ingen brukerid for signatur\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "n�kkel %s: hoppet over undern�kkel\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "n�kkelblokkressurs �%s�: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[oppheving]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 ubrukelig signatur\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ubrukelige signaturer\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en feil\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av feil\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3026,62 +3022,62 @@ msgstr ""
 "andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
 "forskjellige kilder, osv.)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Jeg stoler marginalt\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Jeg stoler fullt\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Brukerid �%s� er utg�tt."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Brukeriden �%s� er ikke selvsignert."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Brukeriden �%s� er signerbar."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3090,11 +3086,11 @@ msgstr ""
 "Selvsignaturen p� �%s�\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3103,11 +3099,11 @@ msgstr ""
 "Din n�v�rende signatur p� �%s�\n"
 "er utg�tt.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3116,54 +3112,54 @@ msgstr ""
 "Din n�v�rede signatur p� �%s�\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "�%s� var allerede signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vil du likevel signere den igjen? (j/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ingenting � signere med n�kkelen %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�kkelen utg�r den %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Du kan ikke lage en OpenPGP-signatur p� en PGP-2.x-n�kkel i --pgp2-modus.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dette ville gj�re n�kkelen ubrukelig i PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3173,31 +3169,31 @@ msgstr ""
 "tilh�rer den overnevnte personen?  Tast inn �0� dersom du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jeg har sjekket veldig n�ye.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt valg? (angi �?� for mer informasjon): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3206,267 +3202,267 @@ msgstr ""
 "Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
 "n�kkel �%s� (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�kkelen: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3474,574 +3470,574 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "for mange cipher-preferanser\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "for mange digest-preferanser\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "for mange kompresjons-preferanser\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -4049,109 +4045,109 @@ msgstr "Autentisere"
 # K og k for kryptering
 # A og a for autentisering
 # Q og q for avslutte
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-n�kkelpar vil ha %u bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4167,7 +4163,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4183,38 +4179,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4222,11 +4218,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4242,44 +4238,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4290,7 +4286,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -4306,23 +4302,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4330,12 +4326,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4347,7 +4343,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4359,50 +4355,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4411,13 +4407,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4426,7 +4422,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4434,661 +4430,661 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "N�kkelknippe"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Fingeravtrykk for undern�kkel:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undern�kkel:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr " N�kkelfingeravtrykk ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cacher n�kkelknippet �%s�\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu n�kler cachet (%lu signaturer)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ADVARSEL: n�kkelserver-valget �%s� er ikke i bruk p� denne plattformen\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "utkoblet"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-n�kkel ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fila �%s� finnes. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Overskrive (j/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Tast inn nytt filnavn"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar at signert data er i �%s�\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5099,24 +5095,24 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Gjenta passfrase\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5125,17 +5121,17 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5144,154 +5140,154 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �pne JPEG-fil �%s�: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at du vil bruke den? (j/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "�%s� er ikke et JPEG-fil\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ingen grunn er angitt"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "N�kkelen er overg�tt"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "N�kkelen har blitt kompromittert"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "N�kkelen er ikke lengre i bruk"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Brukerid er ikke lengre gyldig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Ingen tillitsverdi tilordnet til:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka �%s�\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
 "brukeren?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jeg vet ikke eller vil ikke uttale meg\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jeg stoler IKKE p� den\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jeg stoler fullstendig p� den\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = tilbake til hovedmenyen\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = avslutt\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Valget ditt? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig sette denne n�kkelen til fullstendig tillit? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finnes ingen indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det er begrenset indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "denne n�kkelen tilh�rer oss\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5301,110 +5297,110 @@ msgstr ""
 "brukeriden.  Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
 "neste sp�rsm�let med ja.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan bety at signaturen er falsk.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Merk: Denne n�kkelen er utg�tt!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Det er ingen indikasjon p� at signaturen tilh�rer eieren.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er sannsynligvis et FALSKNERI.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
 "signaturer!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer brukeren.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5412,177 +5408,177 @@ msgstr ""
 "\n"
 "Tast inn brukeriden.  Avslutt med en blank linje: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Det finnes ingen slik brukerid.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�kkel er utkoblet.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukjent standardmottaker �%s�\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adressater\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr ""
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr ""
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5593,118 +5589,118 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Ugyldig passfrase; vennligst pr�v igjen"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "svak n�kkel ble opprettet - pr�ver p� nytt\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
 "ganger!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
 # Er dette entallsformen av denne strengen?
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5713,7 +5709,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5721,75 +5717,75 @@ msgstr ""
 "n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5797,533 +5793,527 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppet over �%s�: er duplikat\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over �%s�: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "for lang linje"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ugyldig fingeravtrykk"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "verdi for eiertillit mangler"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke opprette l�s for �%s�\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke l�se �%s�\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�kkel %s markert som endelig betrodd.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ opphevet]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ utg�tt]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ ukjent]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ udef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
@@ -6331,372 +6321,372 @@ msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "N�kkel tilgjengelig ved: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA-fingeravtrykk: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bekrefte en signatur"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "nei"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[ikke satt]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6707,315 +6697,315 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "sjekke signaturer"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7026,136 +7016,127 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr ""
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7166,13 +7147,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7180,246 +7161,250 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Signatur opprettet %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra �%s�"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                aka �%s�"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "avslutt"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -7429,7 +7414,7 @@ msgstr "Admin-kommandoer er ikke tillatt\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7439,166 +7424,175 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "kryptere data"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [filnavn]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ikke st�ttet"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
diff --git a/po/pl.po b/po/pl.po
index 1701adc3d..e42353d8f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -24,155 +24,155 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Powt�rz has�o: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -183,39 +183,39 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "U�y� tego klucza pomimo to? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Has�o\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -225,343 +225,348 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "szukanie kluczy na serwerze"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uaktualnienie bazy zaufania"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "niepoprawne has�o"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Anuluj"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "b��d odczytu: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -574,7 +579,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -584,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -596,249 +601,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "tak"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "tak"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nie"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "wyj�cie"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "wW"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "l"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -846,207 +851,199 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1054,450 +1051,450 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
 "program�w\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1505,133 +1502,133 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1641,47 +1638,47 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1689,7 +1686,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1710,15 +1707,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1728,7 +1725,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1736,73 +1733,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1810,21 +1807,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1832,496 +1829,496 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2329,7 +2326,7 @@ msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
 "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2340,7 +2337,7 @@ msgstr ""
 "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
 "certyfikat�w."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2352,18 +2349,18 @@ msgstr ""
 "tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
 "do kt�rego masz absolutne zaufanie.\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie ma\n"
 "�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Podaj adresat�w tej wiadomo�ci."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2377,7 +2374,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2388,16 +2385,16 @@ msgstr ""
 "si�\n"
 "najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Wprowad� rozmiar klucza"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied� \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2409,20 +2406,20 @@ msgstr ""
 "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
 "jako okres."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w�a�ciciela klucza."
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Prosz� wprowadzi� opcjonalny komentarz"
 
 # OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2436,11 +2433,11 @@ msgstr ""
 "O aby kontynuowa� tworzenie klucza.\n"
 "Q aby zrezygnowa� z tworzenia klucza."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Je�li ma zosta� wygenerowany podklucz, nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2511,12 +2508,12 @@ msgstr ""
 "\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2524,11 +2521,11 @@ msgstr ""
 "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
 "wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2538,7 +2535,7 @@ msgstr ""
 "poniewa� mo�e by� wa�ny dla zestawienia po�aczenia zaufania do klucza\n"
 "kt�rym go z�o�ono lub do innego klucza nim po�wiadczonego."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2551,13 +2548,13 @@ msgstr ""
 "w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
 "pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ten podpis jest niepoprawny. Mo�na usuni�� go ze zbioru kluczy."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2571,7 +2568,7 @@ msgstr ""
 "klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
 "drugi raz podpisany w ten sam spos�b."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2581,30 +2578,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
 "jedn� sekund�. \n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Prosz� powr�trzy� has�o, aby upewni� si� �e nie by�o pomy�ki."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Je�li mo�na nadpisa� ten plik, nale�y odpowiedzie� ,,tak''"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2631,7 +2628,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2641,535 +2638,535 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3182,63 +3179,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3247,11 +3244,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3260,11 +3257,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3273,56 +3270,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3331,32 +3328,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3365,99 +3362,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3465,11 +3462,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3477,209 +3474,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3687,242 +3684,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Adnotacja: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3930,19 +3927,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3951,7 +3948,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3960,74 +3957,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4037,377 +4034,377 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4423,7 +4420,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4439,40 +4436,40 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4480,12 +4477,12 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4502,44 +4499,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4550,7 +4547,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4567,37 +4564,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4609,7 +4606,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4625,50 +4622,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4677,12 +4674,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4690,7 +4687,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4698,675 +4695,675 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nigdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik ,,%s'' ju� istnieje. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka nazwy\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5377,24 +5374,24 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5404,17 +5401,17 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5428,158 +5425,158 @@ msgstr ""
 "publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
 "Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "pow�d uniewa�nienia: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "komentarz do uniewa�nienia: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMwWpP"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Brak warto�ci zaufania dla:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = nie wiem\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NIE ufam mu\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " p = pomini�cie klucza\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5591,113 +5588,113 @@ msgstr ""
 "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony\n"
 "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5705,179 +5702,179 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Zostanie uniewa�niony przez:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5901,122 +5898,122 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza�ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZE�ENIE: podklucz podpisuj�cy %08lX jest niepoprawnie skro�nie "
 "podpisany\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund� m�odszy od podpisu\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund(y) m�odszy od podpisu\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6024,7 +6021,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6032,55 +6029,55 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6088,7 +6085,7 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6097,74 +6094,74 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6173,349 +6170,349 @@ msgstr ""
 "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
 "# (u�yj \"gpg --import-ownertrust\" aby j� wczyta�)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "linia zbyt d�uga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "b��d podczas odczytu zapisu warto�ci zaufania: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6525,146 +6522,140 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6672,391 +6663,391 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "bez odwo�a� do terminala"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "sprzeczne polecenia\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Klucz dost�pny w: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Odcisk klucza:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "sprawdzenie podpisu"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "nie"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "nieznany"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7067,307 +7058,307 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "podw�jny certyfikat - usuni�ty"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "podw�jny certyfikat - usuni�ty"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(nie podano)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lista kluczy prywatnych"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmiana has�a klucza"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "dodanie zbioru kluczy do u�ywanych"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|wymuszenie algorytmu kompresji N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7378,137 +7369,127 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Prosz� wybra� rodzaj klucza:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Poprawny certyfikat"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7519,13 +7500,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7533,248 +7514,252 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                        alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "wyj�cie"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linia zbyt d�uga\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "brak klucza publicznego"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
@@ -7784,7 +7769,7 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7794,167 +7779,180 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "odszyfrowanie poprawne\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "odszyfrowanie poprawne\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [plik]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: nie znaleziono u�ytkownika %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Prosz� wybra� rodzaj klucza:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
diff --git a/po/pt.po b/po/pt.po
index a6bf1263e..f89a98820 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -17,154 +17,154 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,40 +175,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,343 +218,348 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -567,7 +572,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -577,7 +582,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -589,250 +594,250 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[Utilizador n�o encontrado]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "n�o"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "sair"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -840,205 +845,197 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1046,245 +1043,245 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informa��es de 'ownertrust' limpas\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1293,202 +1290,202 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 #, fuzzy
 msgid "unable to execute external program\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, fuzzy, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1496,133 +1493,133 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1632,51 +1629,51 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1684,7 +1681,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1704,15 +1701,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1722,7 +1719,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1730,591 +1727,591 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2324,7 +2321,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2337,20 +2334,20 @@ msgstr ""
 "para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
 "\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2364,7 +2361,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2374,16 +2371,16 @@ msgstr ""
 "cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
 "Por favor consulte primeiro o seu perito em seguran�a."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2395,19 +2392,19 @@ msgstr ""
 "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2421,11 +2418,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2497,12 +2494,12 @@ msgstr ""
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2510,11 +2507,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2524,7 +2521,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2536,13 +2533,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la do seu porta-chaves."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2555,7 +2552,7 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2566,23 +2563,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2591,7 +2588,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2620,7 +2617,7 @@ msgstr ""
 "     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
 "     que um endere�o de email � inv�lido.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2630,531 +2627,531 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3167,63 +3164,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3232,11 +3229,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3245,12 +3242,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3259,55 +3256,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3317,31 +3314,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3350,100 +3347,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3451,11 +3448,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3463,209 +3460,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3673,242 +3670,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3916,25 +3913,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3943,76 +3940,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4021,377 +4018,377 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4407,7 +4404,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4423,40 +4420,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4464,12 +4461,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4487,44 +4484,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4535,7 +4532,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4552,23 +4549,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4576,12 +4573,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4593,7 +4590,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4605,50 +4602,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4657,12 +4654,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4670,7 +4667,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4678,678 +4675,678 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5362,24 +5359,24 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5389,17 +5386,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5408,162 +5405,162 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "motivo da revoca��o: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "coment�rio da revoca��o: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = N�o sei\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Eu N�O confio\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = saltar esta chave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Decis�o? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5575,113 +5572,113 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5689,181 +5686,181 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5874,124 +5871,124 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "a gerar a 'checksum' (depreciada) de 16-bit para protec��o da chave secreta\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5999,7 +5996,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6007,55 +6004,55 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
 "desconhecido\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
 "utilizar n�o expandida.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6063,7 +6060,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6072,21 +6069,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6094,404 +6091,404 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6501,146 +6498,140 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6648,382 +6639,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "a ler op��es de `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impress�o digital"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "n�o"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "vers�o desconhecida"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7036,311 +7027,311 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7351,137 +7342,127 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Por favor selecione o tipo de chave desejado:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7492,13 +7473,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7506,249 +7487,253 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -7758,7 +7743,7 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7768,166 +7753,180 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "decifragem correcta\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nome_do_ficheiro]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Por favor selecione o tipo de chave desejado:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 223f598d4..3acb5b3ca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,155 +21,155 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Digite o identificador de usu�rio: "
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -180,40 +180,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usa esta chave de qualquer modo? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Digite a frase secreta: "
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -223,340 +223,344 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de leitura: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -569,7 +573,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -579,7 +583,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -591,248 +595,248 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "n�o"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "sair"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -841,207 +845,199 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1049,446 +1045,446 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta incorreta"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1496,139 +1492,139 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1638,57 +1634,57 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1708,15 +1704,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1726,7 +1722,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1734,595 +1730,595 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -2331,7 +2327,7 @@ msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
 "Utilit�rio de manuten��o do GnuPG\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2341,7 +2337,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2349,19 +2345,19 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2375,23 +2371,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2403,19 +2399,19 @@ msgstr ""
 "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2429,11 +2425,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2474,12 +2470,12 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2487,11 +2483,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de usu�rio.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2501,7 +2497,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2513,13 +2509,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la de seu chaveiro."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2532,33 +2528,33 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
 "digitou."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2566,7 +2562,7 @@ msgstr ""
 "Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN o\n"
 "arquivo padr�o (que � mostrado em colchetes) ser� usado."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2582,535 +2578,535 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta incorreta"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3129,172 +3125,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3303,90 +3299,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3394,12 +3390,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3407,208 +3403,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3616,725 +3612,725 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4350,7 +4346,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -4367,40 +4363,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4408,12 +4404,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4430,44 +4426,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4478,7 +4474,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4493,24 +4489,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4518,12 +4514,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4535,7 +4531,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4547,50 +4543,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4599,12 +4595,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4612,7 +4608,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4620,684 +4616,684 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5309,26 +5305,26 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5338,17 +5334,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5357,164 +5353,164 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 #, fuzzy
 msgid "revocation comment: "
 msgstr "[revoga��o]"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5526,299 +5522,299 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5829,122 +5825,122 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5952,7 +5948,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5960,127 +5956,127 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, fuzzy, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6089,352 +6085,352 @@ msgstr ""
 "# Lista de valores de confian�a designados, criada em %s\n"
 "# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "linha muito longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro lendo registro de diret�rio: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de leitura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6444,146 +6440,140 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "rev- revoga��es de chaves incorreta\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6591,390 +6581,390 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo op��es de `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Impress�o digital:"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "n�o"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "vers�o desconhecida"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6986,310 +6976,310 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "certificado duplicado - removido"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certificado duplicado - removido"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7300,136 +7290,127 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr ""
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Por favor selecione o tipo de chave desejado:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correto"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7440,13 +7421,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7454,251 +7435,255 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta chave n�o � protegida.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correta de \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
 # INICIO MENU
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linha muito longa\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -7708,7 +7693,7 @@ msgstr "escrevendo certificado privado para `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7718,166 +7703,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "descriptografia correta\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "descriptografia correta\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nome_do_arquivo]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usu�rio n�o encontrado: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "rev- revoga��es de chaves incorreta\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Por favor selecione o tipo de chave desejado:\n"
+
+#, fuzzy
 #~ msgid "can't query passphrase in batch mode\n"
 #~ msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
diff --git a/po/ro.po b/po/ro.po
index 2a173fa0b..31a7c3c01 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,137 +37,137 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Admin"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repeta�i acest PIN: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -178,40 +178,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -221,287 +221,292 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -509,57 +514,57 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -572,7 +577,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -582,7 +587,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -594,246 +599,246 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "da"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "dD"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nu"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "termin�"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "OK|OK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "renun��|renun��"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -841,192 +846,184 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1037,221 +1034,221 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informa�ii �ncredere-proprietar cur��ate\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1259,7 +1256,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1268,200 +1265,200 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure "
 "pentru permisiunile fi�ierului\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nu pot executa programul `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nu pot executa shell-ul `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "eroare de sistem la chemarea programului extern: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "ie�ire nenatural� a programului extern\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "nu pot executa programul extern\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nu pot citi r�spunsul programului extern: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "cheie secret� de nefolosit"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1469,132 +1466,132 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1604,47 +1601,47 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1652,7 +1649,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1672,15 +1669,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1690,7 +1687,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1698,77 +1695,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1776,21 +1773,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1798,491 +1795,491 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2290,7 +2287,7 @@ msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
 "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2301,7 +2298,7 @@ msgstr ""
 "implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
 "certificatele-de-re�ea (create implicit)."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2313,18 +2310,18 @@ msgstr ""
 "ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
 "aceast� cheie cu nivel de �ncredere suprem\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da"
 "\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2349,7 +2346,7 @@ msgstr ""
 "Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
 "semna."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2359,16 +2356,16 @@ msgstr ""
 "semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
 "�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Introduce�i lungimea cheii"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�spunde�i \"da\" sau \"nu\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2380,19 +2377,19 @@ msgstr ""
 "ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
 "interpreteze valoare dat� ca un interval."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Introduce�i numele de�in�torului cheii"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "V� rug�m introduce�i un comentriu op�ional"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2406,12 +2403,12 @@ msgstr ""
 "O  pentru a continua cu generarea cheii.\n"
 "T  pentru a termina generarea cheii."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2485,11 +2482,11 @@ msgstr ""
 "\n"
 "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2497,11 +2494,11 @@ msgstr ""
 "R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
 "Toate certificatele sunt de asemenea pierdute!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2512,7 +2509,7 @@ msgstr ""
 "stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
 "de aceast� cheie."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2524,7 +2521,7 @@ msgstr ""
 "cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
 "constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2532,7 +2529,7 @@ msgstr ""
 "Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
 "d-voastr� de chei."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2546,7 +2543,7 @@ msgstr ""
 "A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
 "dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2556,25 +2553,25 @@ msgstr ""
 "cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
 "tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2582,7 +2579,7 @@ msgstr ""
 "V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
 "va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2611,7 +2608,7 @@ msgstr ""
 "folosit;\n"
 "      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2621,530 +2618,530 @@ msgstr ""
 "certificat de revocare.  V� rug�m fi�i concis.\n"
 "O linie goal� termin� textul.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Nici un ajutor disponibil"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "cheie secret� de nefolosit"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "resurs� keyblock `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3155,17 +3152,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3175,47 +3172,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3224,11 +3221,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3237,12 +3234,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3251,43 +3248,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3295,11 +3292,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3310,31 +3307,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3343,76 +3340,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3420,11 +3417,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3432,190 +3429,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3627,228 +3624,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3857,17 +3854,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3876,7 +3873,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3885,74 +3882,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3962,369 +3959,369 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4340,7 +4337,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4356,38 +4353,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4395,11 +4392,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4416,44 +4413,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4464,7 +4461,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4479,23 +4476,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4503,12 +4500,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4519,7 +4516,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4531,50 +4528,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4584,12 +4581,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4597,7 +4594,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4605,669 +4602,669 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "niciodat� "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politic� de semn�turi critic�: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politic� de semn�turi: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufix necunoscut\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Introduce�i un nou nume-fi�ier"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "fi�ier de configurare nou `%s' creat\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5279,24 +5276,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5305,17 +5302,17 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5331,113 +5328,113 @@ msgstr ""
 "foarte larg�!\n"
 "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fi�ier JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este aceast� poz� corect� (d/N/t)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMtTsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
 "numit?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = NU am �ncredere\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Am �ncredere suprem�\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = �napoi la meniul principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  t = termin�\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5446,42 +5443,42 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Aceast� cheie ne apar�ine\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5491,111 +5488,111 @@ msgstr ""
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
 "r�spunde cu da la urm�toarea �ntrebare.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5603,179 +5600,179 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportat�\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Pentru a fi revocat de:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5793,121 +5790,121 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-"
 "parol�.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "cheie slab� creat� - re�ncerc\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5915,7 +5912,7 @@ msgstr ""
 "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5923,52 +5920,52 @@ msgstr ""
 "cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5976,7 +5973,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5985,21 +5982,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6007,49 +6004,49 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� \"%s\": duplicat�\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
 "semn�turi!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6058,344 +6055,344 @@ msgstr ""
 "# List� cu valori de �ncredere atribuite, creat� %s\n"
 "# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "linie prea lung�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "caracter : lips�"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "amprent� invalid�"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu exist�!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nu pot �ncuia (lock) `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori �n trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6405,146 +6402,140 @@ msgstr ""
 "V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
 "ar trebui s� fie primul dat �n linia de comand�.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
@@ -6552,378 +6543,378 @@ msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibil� la: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Aceast� cheie a expirat!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verific� o semn�tur�"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "nu"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[nesetat(�)]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6935,308 +6926,308 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "folose�te cheia implicit� ca destinatar implicit"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "for�eaz� semn�turi v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7247,137 +7238,127 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleme la verificare revoc�rii: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7388,13 +7369,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7402,247 +7383,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \"%s\""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "termin�"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linie prea lung�"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -7652,7 +7637,7 @@ msgstr "Nu sunt permise comenzi administrare\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7662,166 +7647,180 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "decriptare OK\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [nume_fi�ier]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nu pot deschide %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr ""
+#~ "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
diff --git a/po/ru.po b/po/ru.po
index a830d0971..1e6969e5d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -16,116 +16,116 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "ошибка получения серийного номера карты: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "обнаружена карта, серийный номер: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "ошибка получения аутентификационного keyID по умолчанию карты: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "в карте не обнаружен пригодный ключ: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "сбой записи ключа: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Введите фразу-пароль для ssh ключа%0A  %c"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -134,29 +134,29 @@ msgstr ""
 "Введите фразу-пароль для защиты принятого закрытого ключа%%0A   %s%%0Aвнутри "
 "хранилища ключей gpg-agent"
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Административный PID"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 msgid "Repeat this PIN"
 msgstr "Повторите ввод PIN"
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный PIN не совпал; попробуйте еще раз"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -167,36 +167,36 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Всё равно использовать данный ключ? (y/N)"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Введите фразу-пароль\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -204,109 +204,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -314,136 +314,141 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "нет gpg-agent доступого для данной сессии\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Использование: gpg-preset-passphrase [параметры] KEYGRIP (-h для подсказки)\n"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -451,11 +456,11 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметры] KEYGRIP\n"
 "Кеширование паролей\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Использование: gpg-protect-tool [параметры] (-h для подсказки)\n"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 #, fuzzy
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
@@ -464,21 +469,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -486,55 +491,55 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "ошибка открытия `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "файл `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "системный список доверий `%s' не доступен\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "недопустимый отпечаток в `%s', строка %d\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
 
@@ -547,7 +552,7 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -559,7 +564,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr "Подтверждаю"
 
@@ -571,7 +576,7 @@ msgstr "Подтверждаю"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -580,234 +585,234 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr "Нет"
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr ""
 
-#: common/http.c:1671
+#: common/http.c:1669
 msgid "host not found"
 msgstr "хост не найден"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "проблема связи с gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров gpg-agent\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr "прервано пользователем\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла дампа образа памяти: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец %s \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "да|Да|yes|Yes"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "нет|Нет|no|No"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr ""
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "выход за безопасный предел памяти при распределении %lu байтов"
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "неожидаемый формат ASCII:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "символы quoted printable в кодировке ASCII - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -815,191 +820,183 @@ msgstr ""
 "имя примечания должно содеражать только печатные символы и пробелы, и '=' на "
 "конце\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя пользовательского примечания должно содержать символ '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "имя примечания должно содержать не более одного символа '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющих символов\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "ВНИМАНИЕ: обнаружено недопустимое примечание\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr "нет работающих gpg-agent - запускаем\n"
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Имя владельца карты:"
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать резервную копию ключа шифрования вне карты? (Y/n)"
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1010,422 +1007,422 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Следует изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(если только ключ не задан отпечатком)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Удалить данный ключ из таблицы ключей? (y/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Это секретный ключ! - действительно удалить? (y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "информация о доверии владельцу очищена\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "сначала воспользуйтесь \"--delete-secret-keys\" для удаления закрытого "
 "ключа.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка создания фразы-пароля: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK в S2K режиме\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "использутся алгоритм шифрования %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "читаю из `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "не могу использовать шифр IDEA для всех ключей.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Нельзя использовать %s в режиме %s\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "удаленный запуск программы не поддерживается\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе требуется использование временных файлов при вызове "
 "внешних программ\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "не могу запустить программу `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "не могу запустить оболочку `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка системы при вызове внешней программы: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "не могу запустить внешнюю программу\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "не могу прочитать ответ внешней программы: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "экспорт подписей, помеченных как локальные"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "экспорт отзывающих ключей помеченных \"sensitive\""
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "удаление фразы-пароля из экспортируемых подключей"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "удаление неиспользуемых частей из ключа при экспорте"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: ключ находится на карте - пропущен\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "сбой снятия защиты с подключа: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "автоматически полученный `%s' via %s\n"
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1433,132 +1430,132 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[файл]|создать подпись к файлу"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [файлы]|вывести хэши файлов"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1568,47 +1565,47 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1616,7 +1613,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1636,15 +1633,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1654,7 +1651,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1662,92 +1659,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1755,481 +1752,481 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2237,7 +2234,7 @@ msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
 "Проверка подписей сделанных доверяемыми ключами\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2247,7 +2244,7 @@ msgstr ""
 "третьей стороне.  Это необходимо для реализации Сети Доверия;\n"
 "и не имеет ничего общего с (неявно созданной) сетью сертификатов."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2259,16 +2256,16 @@ msgstr ""
 "секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
 "данному ключу\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Если хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Введите User ID адресата, которому хотите отправить сообщение."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2292,7 +2289,7 @@ msgstr ""
 "\n"
 "Первый (он же главный) ключ всегда должен быть подписывающим."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2304,16 +2301,16 @@ msgstr ""
 "Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
 "как использовать данный ключ."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Введите размер ключа"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Ответьте \"yes\" или \"no\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2325,19 +2322,19 @@ msgstr ""
 "уведомление при ошибке в формате - вместо этого система попробует\n"
 "интерпретировать введенное значение как интервал."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Введите имя владельца ключа"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "введите необязательный, но очень рекомендуемый email адрес"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Введите необязательный комментарий"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2351,11 +2348,11 @@ msgstr ""
 "O  продолжить создание ключа.\n"
 "Q  выйти и прервать создание ключа."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ответьте \"yes\" (или только \"y\"), если готовы создавать подключ."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2426,11 +2423,11 @@ msgstr ""
 "\n"
 "Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Ответьте \"yes\", если хотите подписать ВСЕ User ID"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2438,11 +2435,11 @@ msgstr ""
 "Ответьте \"yes\", если действительно хотите удалить данный User ID.\n"
 "Все сертификаты также будут потеряны!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Ответьте \"yes\", если готовы удалить подключ"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2452,7 +2449,7 @@ msgstr ""
 "удалять такие подписи, потому, что она может быть важна для установления\n"
 "достоверности ключа или других ключей подписанных данным ключом."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2464,7 +2461,7 @@ msgstr ""
 "узнаете, какой ключ был использован, т.к. эта подпись может\n"
 "устанавливать достоверность через другие уже удостоверенные ключи."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2472,7 +2469,7 @@ msgstr ""
 "Подпись недействительна.  Это дает основания удалить ее из\n"
 "связки ключей."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2486,7 +2483,7 @@ msgstr ""
 "Делайте это только если данная самоподпись не действительна по\n"
 "каким-либо причинам и существует доступная вторая."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2496,24 +2493,24 @@ msgstr ""
 "на текущий список предпочтений.  Отметка времени на всех затронутых\n"
 "самоподписях будет увеличена на одну секунду.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Введите фразу-пароль (это секретная строка) \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Повторите фразу-пароль, чтобы убедиться в том, что она набрана правильно."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Введите имя файла, к которому относится данная подпись"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ответьте \"yes\", если хотите перезаписать файл"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2521,7 +2518,7 @@ msgstr ""
 "Введите новое имя файла. Если нажмете только RETURN будет использован\n"
 "по умолчанию тот файл, который показан в квадратных скобках."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2550,7 +2547,7 @@ msgstr ""
 "      Обычно используется, для указания, что данный e-mail больше\n"
 "      не используется\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2560,130 +2557,130 @@ msgstr ""
 "создания сертификата отзыва.  Будьте кратки.\n"
 "Для завершения введите пустую строку.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Нет доступной справки"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "импорт подписи помеченной как локальная"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "не обновлять таблицу доверий после импорта"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "создать открытый ключ при импорте секретного ключа"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "принимать только обновления имеющихся ключей"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "удалять неиспользуемые части из ключа после импорта"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "удалять всё что возможно из ключа после импорта"
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизмененных секретных ключей: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    подписей очищено: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      очищено User ID: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2692,395 +2689,395 @@ msgstr ""
 "ВНИМАНИЕ: ключ %s содержит предпочтения для недоступных\n"
 "алгоритмов для данных User IDs:\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространите данный ключ, чтобы избежать потенциальных проблем "
 "несовпадения алгоритмов\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "можете обновить список предпочтений используя: gpg --edit-key %s updpref "
 "save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение подключа исправлено\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят несамоподписанный User ID \"%s\"\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3092,17 +3089,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3112,47 +3109,47 @@ msgstr ""
 "Глубина превышающая 1 позволит подписываемому ключу делать\n"
 "доверенные подписи от Вашего лица.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите подписать? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" подписываем."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3161,11 +3158,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Хотите сделать это самоподписью OpenPGP? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3174,11 +3171,11 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3187,53 +3184,53 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Хотите чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "Нельзя сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3243,31 +3240,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если не уверены как ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3276,74 +3273,74 @@ msgstr ""
 "Уверены в том, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3351,11 +3348,11 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3363,184 +3360,184 @@ msgstr ""
 "Не хотите задать фразу-пароль? Это очень *ПЛОХАЯ* идея!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "переместить резервную копию на смарткарту"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранный User ID как главный"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "установить примечание для выбранных User ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить неиспользуемые подписи с ключа"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить все подписи с ключа"
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3552,224 +3549,224 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Совет: Выберите User ID для подписания\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Следует выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Нельзя удалить последний User ID!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент: имя файла\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Ошибка чтения резервного ключа с `%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Установить предпочтения в:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3777,17 +3774,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3795,7 +3792,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3804,74 +3801,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3880,362 +3877,362 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "ВНИМАНИЕ: некоторые реализации OpenPGP не смогут обработать DSA ключи с "
 "такой длиной хеш-функции\n"
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Подписать"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "Сертифицировать"
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Атентифицировать"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите требуемый тип ключа:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа необходим? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4251,7 +4248,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4267,38 +4264,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до: %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4306,11 +4303,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, даты не превышающие 2106 будут обработаны корректно.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4325,44 +4322,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используемая таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4373,7 +4370,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4388,24 +4385,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4413,12 +4410,12 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4430,7 +4427,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4443,50 +4440,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4494,684 +4491,684 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "никогда   "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Критичные правила для подписи: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Политика подписи: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Критично предпочитаемые серверы ключей:"
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Критичное примечание к подписи: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "включать отозванные ключи в резутатах поиска"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr "включая подключи при поиске по Key ID"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "не удалять временные файлы после использования"
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "автоматически получать ключи при проверке подписей"
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск по именам %s на сервере %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск по именам на %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается схемой сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно загрузить ссылку %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно проанализировать ссылку %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль создана с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu фразами-паролями\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 фразой-паролем\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "расшифровано\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕЧАНИЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл `%s' существует. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: неизвестное окончание\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Введите новое имя файла"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "Вывод в stdout\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "принятие подписанных данных в `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "создан новый файл настроек `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5182,24 +5179,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Повторите ввод фразы-пароля\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5207,17 +5204,17 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5231,113 +5228,113 @@ msgstr ""
 "с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
 "большое изображение. Рекомендуемый размер около 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя JPEG файла для Фото ID: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Не могу открыть JPEG файл `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Действительно хотите использовать его? (y/N)"
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' - не JPEG файл\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Данное фото правильное (y/N/q)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "прокомментируйте отзыв: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Не задано значение доверия для:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Какова уверенность в принадлежности данного ключа лицу указанному в User ID "
 "ключа?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Не знаю или не буду отвечать\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Не доверяю\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Абсолютно доверяю\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr " m = вернуться в главное меню\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr " q = выход\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5346,43 +5343,43 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Действительно хотите установить АБСОЛЮТНОЕ доверие к владельцу данного "
 "ключа? (y/N)"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертификаты, приводящие к абсолютно доверяемому ключу:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Нет свидетельств принадлежности данного ключа лицу указанному в User ID "
 "ключа\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Мало свидетельств принадлежности данного ключа лицу указанному в User ID "
 "ключа\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Этот ключ вероятно принадлежит названному владельцу\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Данный ключ принадлежит нам\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5392,106 +5389,106 @@ msgstr ""
 "в User ID ключа.  Если ТОЧНО знаете, что делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Всё равно использовать данный ключ? (y/N)"
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ВНИМАНИЕ: возможно данный ключ отозван (ключ отзыва отсутствует)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван ключом назначенным отзывающим!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: Проверенный адрес подписавшего `%s'\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "ЗАМЕЧАНИЕ: Адрес подписавшего `%s' не соответствует формату DNS\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже имеется\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5499,177 +5496,177 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "отлично, мы анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старое шифрование DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "ЗАМЕЧАНИЕ: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕЧАНИЕ: ключ был отозван"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Будет отозван:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это - sensitive ключ отзыва)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5688,120 +5685,120 @@ msgstr ""
 "носитель будет поврежден, но будьте осторожны: система печати\n"
 "может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключ не доступна\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "метод защиты %d%s не поддерживается\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "метод защиты %d не поддерживается\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Неверная фраза-пароль; попробуйте еще раз"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените фразу-пароль еще раз.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "создан слабый ключ - повторение\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA тебует размер хеша кратного 8 битам\n"
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "ключ DSA %s использует небезопасный (%u бит) хеш\n"
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "для ключа DSA %s требуется хеш не менее %u бит\n"
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s имеет недостоверную перекрестную "
 "сертификацию\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5809,7 +5806,7 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5817,49 +5814,49 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "ЗАМЕЧАНИЕ: подписавший ключ %s - просрочен %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5867,7 +5864,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5876,21 +5873,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5898,49 +5895,49 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадежным RNG!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5949,331 +5946,331 @@ msgstr ""
 "# Список присвоенных значений доверия создан %s\n"
 "# (Используйте \"gpg --import-ownertrust\" для их восстановления)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "ошибка в `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "строка слишком длинная"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "пропущено двоеточие"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "неверный отпечаток"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "пропущено значение степени доверия владельцу"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "ошибка чтения в `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "trustdb транзакция слишком длинная\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "нет доступа к `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "невозможно создать блокировку для `%s'\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "невозможно заблокировать `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недействительная таблица доверий\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕЧАНИЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' не является допустимым длинным ID ключа\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: принят как доверяемый ключ\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s встречается более одного раза в таблице доверий\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа для доверяемого ключа - пропущен\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как абсолютно доверяемый.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d действующих записей очищено)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6281,13 +6278,13 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6297,64 +6294,58 @@ msgstr ""
 "Файл подписи (.sig или .asc) должен быть\n"
 "первым из файлов в командной строке.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "для дополнительной информации см. %s\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "преобразование из `%s' в `%s' недоступно\n"
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "сбой преобразования `%s' в `%s': %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 msgid "Please report bugs to "
 msgstr "О найденных ошибка сообщайте "
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Использование: kbxutil [параметры] [файлы] (-h для подсказки)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6362,81 +6353,81 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN всё еще не изменен\n"
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6445,149 +6436,149 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 msgid "read options from file"
 msgstr "получение параметров конфигурации из файла"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6595,213 +6586,213 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "нет запущеного dirmngr - запуск `%s'\n"
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "протокол dirmngr версии %d не поддерживается\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "критичное дополнение сертификата %s не поддерживается"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr "издатель сертификата не помечен как CA"
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr "помеченная критичной политика без настроенных политик"
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr "замечание: не критичные политики сертификана не позволяются"
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 msgid "certificate policy not allowed"
 msgstr "политика сертификата не дозволена"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "число совпавших издателей: %d\n"
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr "сертификат был отозван"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 msgid "no CRL found for certificate"
 msgstr "не найдена CRL для сертификата"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 msgid "the available CRL is too old"
 msgstr "достпуная CRL слишком стара"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки CRL: %s"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 msgid "no issuer found in certificate"
 msgstr "не найден издатель в сертификате"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертификат недостоверный: %s"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr "сертификат еще не достоверен"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 msgid "certificate has expired"
 msgstr "сертификат просрочен"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr "самоподписанный\tсертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой сертификат теперь помечен доверяемым\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в gpg-agent нельзя сделать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "для данной сессии запрещено делать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверий: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr "найдено еще одно соответствие CA  сертификата - повторная попытки"
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификации длиннее дозволенной CA (%d)"
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "ключ DSA %s использует небезопасный (%u бит) хеш\n"
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это MD2 алгоритм)\n"
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 msgid "none"
 msgstr "нет"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 msgid "[none]"
 msgstr "[нет]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 msgid "[Error - invalid encoding]"
 msgstr "[Ошибка - недопустимая кодировка]"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr "[Ошибка - Нет имени]"
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 msgid "[Error - invalid DN]"
 msgstr "[Ошибка - недопустимый DN]"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6812,296 +6803,296 @@ msgstr ""
 "\"%s\"\n"
 "S/N %s, ID %08lX, создан %s"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимость ключа - подразумеваем все\n"
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "ошибка получения информации применимости ключа: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr "сертификат не следует использовать для сертификации\n"
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr "сертификат не следует использовать для шифрования\n"
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr "сертификат не следует использовать для подписывания\n"
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr "сертификат не применим для шифрования\n"
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr "сертификат не применим для подписи\n"
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "строка %d: недопустимый алгоритм\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "строка %d: недопустимая длина ключа %u (допустимо от %d до %d)\n"
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "строка %d: нет допустимого e-mail адреса\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "строка %d: ошибка получения ключа `%s' из карты %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "строка %d: ошибка получения keygrip ключа `%s': %s\n"
 
-#: sm/certreqgen.c:576
-#, c-format
-msgid "line %d: key generation failed: %s\n"
+#: sm/certreqgen.c:574
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "строка %d: cбой создания ключа: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(это RC2 алгоритм)\n"
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(это не похоже не зашифрованное сообщение)\n"
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "сертификат `%s' не найден: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "ошибка блокировки keybox: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "дупликат сертификата `%s' удален\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "сертификат `%s' удален\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "ошибка создания временного файла: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "ошибка записи во временный файл: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|создать подпись"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 msgid "list certificate chain"
 msgstr "вывести список правил сертификатов"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 msgid "remove key from the public keyring"
 msgstr "удалить ключ из таблицы открытых ключей"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr "предполагаем получение в формате PEM"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr "предполагаем получение в формате BASE64"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr "предполагаем получение в двоичном формате"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr "используем системный dirmngr, если доступен"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr "не сверять с CRL"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr "проверка действительности используя OCSP"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о политиках из FILE"
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr "не проверять политики сертификата"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr "запросить пропущенных издаталей сертификатов"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|использовать NAME как получателя по умолчанию"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "использовать ключ по умолчанию как получателя по умолчанию"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "принудительная подпись v3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "всегда использовать MDC для шифрования"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не запрашивать"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "предполагать Да на большинство вопросов"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "предполагать Нет на большинство вопросов"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "добавить данную таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|установить кодировку терминала в NAME"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|загрузить модуль дополнения FILE"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7112,134 +7103,124 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent недоступен в данной сессии\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Выберите тип создаваемого ключа:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "всего обработано: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 msgid "error storing certificate\n"
 msgstr "ошибка сохранения сертификата\n"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr "ошибка базовой проверки сертификата - не импортирован\n"
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "ошибка создания keybox `%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr "возможно следует запустить gpg-agent сперва\n"
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "создан keybox `%s'\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "сбой получения отпечатка\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr ""
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "ошибка сохранения сертификата: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "ошибка получения сохраненных флагов: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "ошибка сохранения флагов: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 "GPG_TTY не установлено - возможно использование подделанного  умолчания\n"
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "неверное сформатированный отпечаток в `%s', строка %d\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "недопустисый код страны в `%s', строка %d\n"
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7250,7 +7231,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7258,7 +7239,7 @@ msgstr ""
 "Учтите, что для данной программы официально не одобрено создание и проверка "
 "подобных подписей.\n"
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7266,61 +7247,61 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 msgid "Signature made "
 msgstr "Подпись сделана"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr "[дата не указана]"
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr "с использованием сертификата ID %08lX\n"
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 msgid "Good signature from"
 msgstr "Действительная подпись от"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 msgid "                aka"
 msgstr "                aka"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Использование: gpg-connect-agent [параметры] (-h для подсказки)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7328,161 +7309,165 @@ msgstr ""
 "Синтаксис: gpg-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и отcылает команды\n"
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 msgid "line too long - skipped\n"
 msgstr "строка слишком длинная - пропущено\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "неизвестная команда `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "ошибка отправки %s команды: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr "вывод списка всех компонентов"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод списка параметров"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr "применить изменения во время исполнения, если возможно"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Использование: gpgconf [параметры] (-h для подсказки)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7490,19 +7475,19 @@ msgstr ""
 "Синтаксис: gpgconf [параметры]\n"
 "Управляет параметрами конфигурации инструментария GnuPG\n"
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 msgid "usage: gpgconf [options] "
 msgstr "использование: gpgconf [параметры] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Команды администрирования не разрешены\n"
@@ -7512,7 +7497,7 @@ msgstr "Команды администрирования не разрешен�
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка распределения памяти: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 msgid ""
 "@\n"
 "Commands:\n"
@@ -7522,35 +7507,35 @@ msgstr ""
 "Команды:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr "режим расшифрования"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 msgid "encryption modus"
 msgstr "режим зашифровывания"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 msgid "program filename"
 msgstr ""
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr "файл секретного ключа (требуется)"
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr "ввод имени файла (stdin по умолчанию)"
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Использование: symcryptrun [параметры] (-h для подсказки)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -7560,126 +7545,145 @@ msgstr ""
 "[параметры...] COMMAND [файл-источник]\n"
 "Вызывает простой инструмент шифрования\n"
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s над %s прервано, статус %i\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "сбой %s над %s, статус %i\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "невозможно создание временного каталога `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "невозможно открытие %s на запись: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "ошибка записи в %s: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "ошибка чтения из %s: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "ошибка закрытия %s: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr "не задан параметр --program\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr "не задан параметр --keyfile\n"
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "execv failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, c-format
 msgid "select failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, c-format
 msgid "read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "потомок завершился, статус %i\n"
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "следует задать %s либо %s\n"
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr "не задан класс\n"
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "класс %s не поддерживается\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "для дополнительной информации см. %s\n"
+
+#~ msgid "no running gpg-agent - starting one\n"
+#~ msgstr "нет работающих gpg-agent - запускаем\n"
+
+#~ msgid "can't connect to the agent - trying fall back\n"
+#~ msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent недоступен в данной сессии\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Выберите тип создаваемого ключа:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
diff --git a/po/sk.po b/po/sk.po
index dc4565185..8f4b651a3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -13,154 +13,154 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr ""
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -171,40 +171,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vlo�i� heslo\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -214,344 +214,349 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nem��em vytvori� adres�r: %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +569,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +579,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -586,249 +591,249 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[User id not found]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ano"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nie"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "ukon�i�"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr ""
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr ""
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -836,205 +841,197 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1042,243 +1039,243 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifra %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��tam z `%s'\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1286,208 +1283,208 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "volanie extern�ho programu zru�en� kv�li nebezpe�n�m pr�vam s�boru "
 "nastaven�\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "nekorektn� ukon�enie extern�ho programu\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "nemo�no spusti� extern� program\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1495,133 +1492,133 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1631,51 +1628,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1684,7 +1681,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1704,17 +1701,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1724,7 +1721,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1732,586 +1729,586 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2319,7 +2316,7 @@ msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
 "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2330,7 +2327,7 @@ msgstr ""
 "d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
 "certifik�tov\"."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2342,17 +2339,17 @@ msgstr ""
 "k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
 "ako absol�tne d�veryhodn�\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2366,7 +2363,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2377,16 +2374,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
 "Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�ku k���a"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpovedzte \"ano\" alebo \"nie\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2398,19 +2395,19 @@ msgstr ""
 "spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
 "zadan� hodnotu ako interval."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te meno dr�ite�a k���a"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment�r"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2424,11 +2421,11 @@ msgstr ""
 "O  pre pokra�ovanie generovania k���a.\n"
 "Q  pre ukon�enie generovania k���a."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2502,13 +2499,13 @@ msgstr ""
 "\n"
 "Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano\""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2517,11 +2514,11 @@ msgstr ""
 "\".\n"
 "V�etky certifik�ty bud� tie� straten�!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2531,7 +2528,7 @@ msgstr ""
 "preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
 "ceritifikovan�ho t�mto k���om."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2543,13 +2540,13 @@ msgstr ""
 "bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
 "prostredn�ctvom in�ho u� certifikovan�ho k���a."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2562,7 +2559,7 @@ msgstr ""
 "pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
 "n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2572,24 +2569,24 @@ msgstr ""
 "na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch podpisov\n"
 "k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2597,7 +2594,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
 "pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2625,7 +2622,7 @@ msgstr ""
 "      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal pou��va�;\n"
 "      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2635,536 +2632,536 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�ne. \n"
 "Text kon�� pr�zdnym riadkom.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Pomoc nie je k dispoz�cii"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:772
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3177,63 +3174,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3242,11 +3239,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3256,11 +3253,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3270,54 +3267,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3327,32 +3324,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3361,28 +3358,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -3390,72 +3387,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3463,11 +3460,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3475,206 +3472,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3682,241 +3679,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3924,19 +3921,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3944,7 +3941,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3953,75 +3950,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4030,375 +4027,375 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4414,7 +4411,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4430,40 +4427,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4471,12 +4468,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 #, fuzzy
 msgid ""
 "\n"
@@ -4493,44 +4490,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4541,7 +4538,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4556,23 +4553,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4580,12 +4577,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4597,7 +4594,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4609,50 +4606,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4661,12 +4658,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4674,7 +4671,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4682,679 +4679,679 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritick� podpisov� politika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Podpisov� politika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "S�bor `%s' existuje. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�ma pr�pona\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zov s�boru"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5365,24 +5362,24 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5392,17 +5389,17 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5417,160 +5414,160 @@ msgstr ""
 "Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
 "obr�zka je okolo 240x288.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je s�bor JPEG\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "d�vod na revok�ciu: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nie je priraden� �iadna hodnota d�very k:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Neviem\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�verujem\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�verujem absol�tne\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = sp� do hlavn�ho menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " u = ukon�i�\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5582,111 +5579,111 @@ msgstr ""
 "odpoveda� �no\n"
 "\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5694,178 +5691,178 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dovanie DEK nie je podporov�n�\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Bude revokovan�:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� k���)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5883,120 +5880,120 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROVANIE: Zisten� slab� k��� - zme�te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generujem zastaral� 16 bitov� kontroln� s��et na ochranu tajn�ho k���a\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "vytvoren� slab� k��� - sk��am znovu\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr��ov� certifik�ciu\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6004,7 +6001,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -6012,52 +6009,52 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
 "kritick� bit\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6065,7 +6062,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6074,76 +6071,76 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
 "falo�n�m RNG!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6152,350 +6149,350 @@ msgstr ""
 "# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
 "# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr ""
 "importova� hodnoty d�veryhodnosti\n"
 " vlastn�ka k���a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�r neexistuje!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nem��em pracova� s riadkami dlh��mi ako %d znakov\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platn� dlh� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6505,148 +6502,142 @@ msgstr ""
 "Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
 "by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6654,382 +6645,382 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "K��� k dispoz�cii na: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vyp�sa� fingerprint"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikova� podpis"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "nie"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "nezn�me"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7040,313 +7031,313 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "prida� tento s�bor k���ov do zoznamu\n"
 " pou��van�ch s�borov k���ov"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7357,137 +7348,127 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probl�m overenia revok�cie: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7498,13 +7479,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7512,247 +7493,251 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�i�"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -7762,7 +7747,7 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7772,167 +7757,180 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "de�ifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "de�ifrovanie o.k.\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [meno s�boru]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nemo�no otvori� %s: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+
+#, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
diff --git a/po/sv.po b/po/sv.po
index bd8262f43..4f242a3c2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -33,12 +33,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,109 +46,109 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "Passphrase"
 msgstr "Lösenfras"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "identifierade kort med serienummer: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "skuggning av nyckeln misslyckades: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "fel vid skrivning av nyckel: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -157,29 +157,29 @@ msgstr ""
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -194,36 +194,36 @@ msgstr[1] ""
 "Varning:  Du har angivit en lösenfras som%%0Auppenbart inte är säker.  En "
 "lösenfras ska%%0Avara minst %u tecken lång."
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -231,110 +231,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -342,137 +342,142 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "ingen gpg-agent kör i den här sessionen\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -480,11 +485,11 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Användning: gpg-protect-tool [flaggor] (-h för hjälp)\n"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -492,22 +497,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -515,55 +520,55 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -576,7 +581,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -588,7 +593,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -600,7 +605,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -609,232 +614,232 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr "Nej"
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
 # se förra kommentaren
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "fel när uttag skapades: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 msgid "host not found"
 msgstr "värden hittades inte"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 
 # Extension är vad? FIXME
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "ja"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "nej"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "avsluta"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okej|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "avbryt|stoppa"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "aAsS"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ASCII-skal: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -843,7 +848,7 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -851,191 +856,183 @@ msgstr ""
 "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
 "sluta med ett \"'=\"\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte använda några styrtecken\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr "ingen körande gpg-agent - startar en\n"
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1046,222 +1043,222 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använder chiffret %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --"
 "pgp2-läge\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-chiffer för alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1269,7 +1266,7 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1278,199 +1275,199 @@ msgstr ""
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunde inte köra programmet \"%s\": %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "kunde inte köra det externa programmet\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som endast lokala"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "ta bort lösenfrasen från exporterade undernycklar"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln under exportering"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr "exportera nycklar i ett S-uttrycksbaserat format"
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "export av hemliga nycklar tillåts inte\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %s: inte skyddad - hoppade över\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr "på väg att exportera en oskyddad undernyckel\n"
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att ta bort skydd på undernyckel: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %s har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1478,134 +1475,134 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1615,49 +1612,49 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1665,7 +1662,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1685,18 +1682,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera fel till <[email protected]>\n"
 "Skicka synpunkter på översättningen till <[email protected]>\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1706,7 +1703,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1714,74 +1711,74 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1789,19 +1786,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1809,494 +1806,494 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2304,7 +2301,7 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kontrollera signaturerna mot kända nycklar\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2315,7 +2312,7 @@ msgstr ""
 "\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2327,17 +2324,17 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Ange användaridentiteten för den adressat du vill skicka meddelandet till."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2362,7 +2359,7 @@ msgstr ""
 "Första (primär) nyckel måste alltid vara en nyckel som är kapabel att "
 "signera."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2372,16 +2369,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert först!"
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2393,19 +2390,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2419,11 +2416,11 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2506,11 +2503,11 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2518,11 +2515,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2533,7 +2530,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2545,7 +2542,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2554,7 +2551,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2568,7 +2565,7 @@ msgstr ""
 "mer. Så gör bara detta om denna självsignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2580,24 +2577,24 @@ msgstr ""
 "påverkade\n"
 "självsignaturer kommer att flyttas fram en sekund.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenfras. Detta är en hemlig mening\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repetera sista lösenfrasen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om du vill skriva över filen"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2605,7 +2602,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2635,7 +2632,7 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2646,129 +2643,129 @@ msgstr ""
 "och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som endast lokala"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern under importering"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "skapa en publik nyckel när en hemlig nyckel importeras"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        nya användaridentiteter: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nya undernycklar: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                 nya signaturer: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             signaturer rensade: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2777,403 +2774,403 @@ msgstr ""
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %s: algoritmen för publika nycklar stöds inte för "
 "användaridentiteten  \"%s\"\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3184,17 +3181,17 @@ msgstr ""
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3204,46 +3201,46 @@ msgstr ""
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3252,11 +3249,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3265,13 +3262,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3280,44 +3277,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3325,11 +3322,11 @@ msgstr ""
 "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
 "läge\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3338,31 +3335,31 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jag vill inte svara.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jag har gjort viss kontroll.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3371,76 +3368,76 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3448,11 +3445,11 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3460,191 +3457,191 @@ msgstr ""
 "Du vill inte ha någon lösenfras - detta är möjligen en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
 "signaturer från nyckeln"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
 "nyckeln"
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3657,228 +3654,228 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
 "tillhandahåller\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
 "(j/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3886,17 +3883,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3905,7 +3902,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3914,75 +3911,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3992,264 +3989,264 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
 "sammandragsstorleken\n"
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -4257,110 +4254,110 @@ msgstr "Autentisera"
 # K = Kryptera
 # A = Authentisera
 # Q = Avsluta
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4377,7 +4374,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4393,38 +4390,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4432,11 +4429,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4454,44 +4451,44 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4502,7 +4499,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4518,24 +4515,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4543,12 +4540,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4560,7 +4557,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4572,51 +4569,51 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropidata.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skrier hemliga nyckelstumpen till \"%s\"\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4625,13 +4622,13 @@ msgstr ""
 "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
 "syfte.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4639,7 +4636,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4647,672 +4644,672 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "aldrig"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "inkludera spärrade nycklar i sökresultatet"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr "inkludera undernycklar vid sökning efter nyckel-id"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "ta inte bort temporärfiler efter de använts"
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "hämta automatiskt nycklar vid validering av signaturer"
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nycken %s till %s-servern %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5323,24 +5320,24 @@ msgstr ""
 "nyckeln för användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, id %s, skapad %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5349,17 +5346,17 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5373,116 +5370,116 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImHhAsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Inget tillitsvärde tilldelat till:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  även känd som \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jag vet inte eller kan inte säga något\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jag litar INTE\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jag litar förbehållslöst\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  h = gå tillbaka till huvudmenyn\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = hoppa över denna nyckel\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  a = avsluta\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5491,40 +5488,40 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns viss information om att nyckeln tillhör den angivna "
 "användaren\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5534,109 +5531,109 @@ msgstr ""
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
 "ja på nästkommande fråga.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5644,29 +5641,29 @@ msgstr ""
 "\n"
 "Ange användaridentiteten.  Avsluta med en tom rad: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
@@ -5674,106 +5671,106 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den anonyma mottagaren.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller inaktiverad\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckeln %s har inga användaridentiteter\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Kommer att spärras av:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -5782,52 +5779,52 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen motsvarande publik nyckel: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "publik nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "okänd skyddsalgoritm\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5845,126 +5842,126 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig lösenfras; försök igen"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenfras igen.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
 "nyckeln\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
 # cross-certification?
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5972,7 +5969,7 @@ msgstr ""
 "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
 "klocka)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5980,58 +5977,58 @@ msgstr ""
 "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
 "felinställd klocka)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
 # notation data?
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till notationer i signaturer gjorda med en v3-nyckel\n"
 "(PGP 2.x-typ)\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med en "
 "v3-nyckel (PGP 2.x-typ)\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
 "2.x-typ)\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6039,7 +6036,7 @@ msgstr ""
 "VARNING: kunde inte %%-expandera policy-url (för stor).  Använder "
 "oexpanderad.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6048,23 +6045,23 @@ msgstr ""
 "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
 "stor).  Använder oexpanderad.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6072,53 +6069,53 @@ msgstr ""
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6127,227 +6124,227 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "raden är för lång"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "kolon saknas"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "värde för ägartillit saknas"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
 
 # req står för request
 # kollat med Werner. Per
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -6361,128 +6358,128 @@ msgstr "använder tillitsmodellen %s\n"
 #    It gets passed to atoi() so everything after the number is
 #    essentially a comment and need not be translated.  Either key and
 #    uid are both NULL, or neither are NULL. */
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "odefinierad"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginell"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "fullständig"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
 "misslyckades: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6492,64 +6489,58 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "se %s för mer information\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "ställ in felsökningsflaggor"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "aktivera fullständigt felsökningsläge"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 msgid "Please report bugs to "
 msgstr "Rapportera fel till "
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Användning: kbxutil [flaggor] [filer] (-h för hjälp)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6557,81 +6548,81 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "kortet är permanent låst!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
@@ -6639,150 +6630,150 @@ msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanen
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN-kod"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr "avtrycket på kortet stämmer inte med den begärda\n"
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6790,212 +6781,212 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
 # överhoppad eller hoppades över?
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr-protokoll version %d stöds inte\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritiska certifikattillägget %s stöds inte"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som betrodd inte aktiverad i gpg-agent\n"
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som betrodd inaktiverad för den här sessionen\n"
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 msgid "none"
 msgstr "ingen"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 msgid "[none]"
 msgstr "[ingen]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 msgid "[Error - invalid encoding]"
 msgstr "[Fel - ogiltig kodning]"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr "[Fel - slut på kärna]"
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr "[Fel - Inget namn]"
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7006,299 +6997,299 @@ msgstr ""
 "\"%s\"\n"
 "Serienummer %s, id %08lX, skapad %s"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "rad %d: ogiltig nyckellängd %u (giltiga är %d till %d)\n"
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "rad %d: inget ämnesnamn angivit\n"
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "rad %d: fel vid läsning av nyckeln \"%s\" från kortet: %s\n"
 
 # keygrip (i.e. a hash over the public key
 # parameters) formatted as a hex string.
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "rad %d: fel vid hämtning av nyckelhashen \"%s\": %s\n"
 
-#: sm/certreqgen.c:576
-#, c-format
-msgid "line %d: key generation failed: %s\n"
+#: sm/certreqgen.c:574
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "rad %d: nyckelgenerering misslyckades: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "dubblett av certifikatet \"%s\" borttaget\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certifikatet \"%s\" togs bort\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd den här nyckelservern för att slå upp nycklar"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7308,133 +7299,124 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan inte kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: sm/gpgsm.c:1591
-msgid "key generation is not available from the commandline\n"
-msgstr "nyckelgenerering är inte tillgänglig från kommandoraden\n"
-
-#: sm/gpgsm.c:1592
-#, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "använd skriptet \"%s\" för att generera en ny nyckel\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "totalt antal behandlade: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 msgid "error storing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr "du kanske vill starta gpg-agent först\n"
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "nyckelskåpet \"%s\" skapat\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 "GPG_TTY har inte ställts in - använder kanske felaktigt standardvärde\n"
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "ogiltigt formaterat fingeravtryck i \"%s\", rad %d\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7451,7 +7433,7 @@ msgstr ""
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7459,7 +7441,7 @@ msgstr ""
 "Observera att den här programvaran inte officiellt godkänts för att skapa "
 "eller validera sådana signaturer.\n"
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7471,61 +7453,61 @@ msgstr ""
 "Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
 "signatur!"
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr " använder certificate-id %08lX\n"
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 msgid "                aka"
 msgstr "      även känd som"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "tyst"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7533,161 +7515,165 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7695,19 +7681,19 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Administrationskommandon tillåts inte\n"
@@ -7717,7 +7703,7 @@ msgstr "Administrationskommandon tillåts inte\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 msgid ""
 "@\n"
 "Commands:\n"
@@ -7727,35 +7713,35 @@ msgstr ""
 "Kommandon:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr "dekrypteringsmodus"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 msgid "encryption modus"
 msgstr "krypteringsmodus"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr "verktygsklass (confucius)"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 msgid "program filename"
 msgstr "programfilnamn"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr "hemlig nyckelfil (krävs)"
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -7765,128 +7751,145 @@ msgstr ""
 "[flaggor...] KOMMANDO [inmatningsfil]\n"
 "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s på %s avbröts med status %i\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s på %s misslyckades med status %i\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr "flaggan --program angavs inte\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr "flaggan --keyfile angavs inte\n"
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr "kan inte allokera argumentvektor\n"
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kunde inte skapa rör: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "kunde inte skapa pty: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "kunde inte grena process: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv misslyckades: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, c-format
 msgid "select failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, c-format
 msgid "read failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty-läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid misslyckades: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "barnprocess avbröts med status %i\n"
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan inte allokera infilssträng: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "antingen %s eller %s måste anges\n"
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "se %s för mer information\n"
+
+#~ msgid "no running gpg-agent - starting one\n"
+#~ msgstr "ingen körande gpg-agent - startar en\n"
+
+#~ msgid "can't connect to the agent - trying fall back\n"
+#~ msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
+
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "nyckelgenerering är inte tillgänglig från kommandoraden\n"
+
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "använd skriptet \"%s\" för att generera en ny nyckel\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
 #~ "chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
diff --git a/po/tr.po b/po/tr.po
index 6b459170f..54040d178 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -28,7 +28,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,99 +36,99 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Algılanan kartın seri nr: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "anahtar gölgelenemedi: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "anahtarı yazarken hata: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -137,29 +137,29 @@ msgstr ""
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Yönetici PIN'i"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 msgid "Repeat this PIN"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -170,36 +170,36 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Anahtarınızı korumak için Lütfen Anahtar Parolanızı giriniz%0A"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -207,109 +207,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -317,136 +317,141 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "bu oturumda çalışan gpg-agent yok\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
 "Kullanımı: gpg-preset-passphrase [seçenekler] ANHMAŞASI (yardım için -h)\n"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -454,11 +459,11 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kullanımı: gpg-protect-tool [seçenekler] (yardım için -h)\n"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -466,16 +471,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -483,7 +488,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -491,55 +496,55 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
@@ -552,7 +557,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -564,7 +569,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr "Doğru"
 
@@ -576,7 +581,7 @@ msgstr "Doğru"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -585,234 +590,234 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr "Hayır"
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "soket oluşturulurken hata: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 msgid "host not found"
 msgstr "konak yok"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 msgid "canceled by user\n"
 msgstr "kullanıcı tarafından iptal edildi\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "evet"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "hayır"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "hH"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "çık"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "çÇ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "tamam|tamam"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "iptal|iptal"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "tT"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "iİ"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -820,191 +825,183 @@ msgstr ""
 "bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı simgelem ismi '@' karakteri içermeli\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "bir simgelem değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1015,219 +1012,219 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "betik kipinde \"--yes\" olmaksızın bu yapılamaz\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Bu anahtar, anahtarlıktan silinsin mi? (e/H ya da y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "sahibinin güvencesi bilgisi temizlendi\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1235,7 +1232,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1244,198 +1241,198 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
 "edildi\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr " '%s' çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "'%s' kabuğu çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "dış uygulama çalıştırılamıyor\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 "öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "ihracedilen yardımcı anahtarlardan anahtar parolasını kaldırır"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "ihraç sırasında anahtardan kullanışsız parçalar kaldırılır"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr "ihraç sırasında anahtardan mümkün olduğunca çok şey kaldırılır"
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr "anahtarları bir S ifadesine dayalı biçimde ihraceder"
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr "korunmamış bir yardımcı anahtar ihraca hazır\n"
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "yardımcı anahtarın koruması kaldırılamadı: %s\n"
 
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1443,132 +1440,132 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtarlıktan kaldırır"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1578,47 +1575,47 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1626,7 +1623,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1646,17 +1643,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1666,7 +1663,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1674,572 +1671,572 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2247,7 +2244,7 @@ msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
 "Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2258,7 +2255,7 @@ msgstr ""
 "bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
 "hiçbir alakası yok."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2271,18 +2268,18 @@ msgstr ""
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
 " \"evet\" yazın."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2306,7 +2303,7 @@ msgstr ""
 "\n"
 "İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2316,16 +2313,16 @@ msgstr ""
 "değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
 "Lütfen güvenlik uzmanınıza danışın."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluğunu giriniz"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2336,20 +2333,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2363,11 +2360,11 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2429,13 +2426,13 @@ msgstr ""
 "kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes\" "
 "yazın"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2443,11 +2440,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2457,7 +2454,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2469,13 +2466,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Anahtarlıktan kaldırmak uygun olacak."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2488,7 +2485,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2498,23 +2495,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2522,7 +2519,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2550,7 +2547,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2560,129 +2557,129 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "ithalat sonrası güvence veritabanını güncellemez"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "bir gizli anahtar ithal ederken bir genel anahtar oluşturur"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d türündeki blok atlanıyor\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    temizlenen imzalar: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2691,405 +2688,405 @@ msgstr ""
 "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
 "tercihler içeriyor:\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtarlık yok: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtarlıkta\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtarlığı oluşturuldu\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "anahtar bloku özkaynağı `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtarlık arabelleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3100,17 +3097,17 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3120,45 +3117,45 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" imzalanabilir.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "İmzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3167,12 +3164,12 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3181,13 +3178,13 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3196,46 +3193,46 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -3243,11 +3240,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3256,31 +3253,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3290,76 +3287,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3367,13 +3364,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3381,194 +3378,194 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
 "anahtardan kaldırır"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
 "kaldırır"
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3580,239 +3577,239 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3820,17 +3817,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3839,7 +3836,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3848,74 +3845,74 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3925,381 +3922,381 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
 "çalışamayabilir\n"
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "Onayla"
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "Şifrele"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "Kimlik kanıtla"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "OoŞşKkçÇ"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4315,7 +4312,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4331,38 +4328,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4370,11 +4367,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4390,44 +4387,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4438,7 +4435,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4454,24 +4451,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4479,12 +4476,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4496,7 +4493,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4509,50 +4506,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4560,19 +4557,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4580,664 +4577,664 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "asla    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Kritik tercihli anahtar sunucusu: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritik imza simgelemi: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "imza simgelemi: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anahtarlık"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "%s' anahtarlık arabellekleniyor\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtarlık oluşturuldu\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "yürürlükten kaldırılan anahtarlar arama sonuçlarına dahil edilir"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 "anahtar kimliğine göre arama yapılırken yardımcı anahtarlar dahil edilir"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "anahtar sunucusu yardımcılarına veri aktaracak geçici dosyalar kullanılır"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "geçici dosyaları kullandıktan sonra silmez"
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "tercihli anahtar sunucusunun adresini adrese atar"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "anahtarları alırken PKA kaydını bir anahtara atar"
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%2$s sunucusunda %1$s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "%s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" dosyası var. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: bilinmeyen sonek\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5248,24 +5245,24 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5274,17 +5271,17 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5298,112 +5295,112 @@ msgstr ""
 "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
 "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N)  "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç veya y/N/ç) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "bBmMaAkK"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "Güven değeri belirtilmemiş:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  namı-diğer \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = bilmiyorum, kem küm\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = güvence vermem\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Son derece güveniyorum\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr " m = ana menüye dön\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr " ç = çık\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5412,43 +5409,43 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Kararınız? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz?  (e/H ya da "
 "y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
 "belirti yok\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
 "bir belirti var\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5458,110 +5455,110 @@ msgstr ""
 "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
 "sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Bilgi: Doğrulanmış imzacının adresi: `%s'\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Bilgi: İmzacının adresi `%s', DNS girdisiyle eşleşmiyor\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "geçerli PKA bilgisinden dolayı güvence seviyesi TAM olarak ayarlandı\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "kötü PKA bilgisinden dolayı güvence seviyesi ASLA olarak ayarlandı\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5569,180 +5566,180 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Yürürlükten kaldıran:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5760,130 +5757,130 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "koruma algoritması %d desteklenmiyor\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
 "değiştirin.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
 "üretiliyor\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA anahtarı %s, %u bitlik veya daha geniş bir çittirim gerektiriyor\n"
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "UYARI: iletideki imza özümlemesi çelişkili\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5891,54 +5888,54 @@ msgstr ""
 "anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "simgelem verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "simgelem verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: %% genişletmeli simgelem imkansız (çok büyük). Genişletilmeden "
 "kullanılıyor.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5946,7 +5943,7 @@ msgstr ""
 "UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5955,22 +5952,22 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5978,49 +5975,49 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6029,332 +6026,332 @@ msgstr ""
 "# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
 "# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "'%s' de hata: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "satır çok uzun"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ": imi eksik"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "parmakizi geçersiz"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "sahibiningüvencesi değeri kayıp"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[yürürlükten kalktı]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[  süresi  doldu  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[    bilinmeyen   ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[     tanımsız    ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[   şöyle böyle   ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[     tamamen     ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[   son  derece   ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6362,13 +6359,13 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6378,64 +6375,58 @@ msgstr ""
 "İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
 "ilk dosya olması gerektiğini lütfen hatırlayın.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open başarısız: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr "hata ayıklama bayrakları ayarlanır"
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr "tam hata ayıklama etkin olur"
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 msgid "Please report bugs to "
 msgstr "Yazılım hatalarını lütfen "
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Kullanımı: kbxutil [seçenekler] [dosyalar] (yardım için -h)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6443,82 +6434,82 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 #, fuzzy
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr "BoşPIN henüz değişmedi\n"
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6527,148 +6518,148 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 msgid "read options from file"
 msgstr "seçenekler dosyadan okunur"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6676,213 +6667,213 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritik sertifika eklentisi %s desteklenmiyor"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr "sertifikacı onu bir CA gibi imlememiş"
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr "harici bir sertifikacı arar\n"
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olunuz\n"
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 msgid "no issuer found in certificate"
 msgstr "sertifikacı kim belli değil"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmakizi=%s\n"
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "güvenilir olarak etkileşimli imleme gpg-agent'ta etkin değil\n"
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "güvenilir olarak etkileşimli imleme bu oturum için iptal edildi\n"
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 msgid "none"
 msgstr "yok"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 msgid "[none]"
 msgstr "[yok]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 msgid "[Error - invalid encoding]"
 msgstr "[Hata - kodlama geçersiz]"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr "[Hata - nüve dışında]"
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr "[Hata - Adsız]"
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 msgid "[Error - invalid DN]"
 msgstr "[Hata - DN geçersiz]"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6893,296 +6884,296 @@ msgstr ""
 "\"%s\"\n"
 "S/N: %s, Kimlik: %08lX, oluşturuluşu: %s"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr "sertifika onaylama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr "sertifika şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifika şifreleme için elverişli değil\n"
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr "sertifika imzalama için elverişli değil\n"
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "`%d. satır: algoritma geçersiz\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "%d. satır: anahtar uzunluğu %u geçersiz (%d .. %d geçerli)\n"
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "%d. satır: konu ismi belirtilmemiş\n"
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr "%1$d. satır: %3$d konumundaki konu ismi %2$s' geçersiz\n"
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "%d. satır: geçerli bir eposta adresi değil\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "%d. satır: `%s' anahtarı karttan okunurken hata: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "%d. satır: `%s' anahtar maşası tarafından alınırken hata: %s\n"
 
-#: sm/certreqgen.c:576
-#, c-format
-msgid "line %d: key generation failed: %s\n"
+#: sm/certreqgen.c:574
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "%d. satır: anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(bu, RC2 algoritmasıdır)\n"
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "anahtar bloğu kilitlenirken hata: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "yinelenmiş sertifika `%s' silindi\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "sertifika `%s' silindi\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "|[FILE]|make a signature"
 msgstr "|[DOSYA]|bir imza yapar"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 msgid "remove key from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtarlığı anahtarlık listesine ekler"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7192,133 +7183,123 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent bu oturumda kullanılamaz\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "işlenmiş toplam miktar: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 msgid "error storing certificate\n"
 msgstr "sertifika saklanırken hata\n"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr "gpg-agent'ı önce başlatmak isteyebilirsiniz\n"
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "`%s' anahtar bloğu oluşturuldu\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "parmakizinin alınması başarısız oldu\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr "GPG_TTY atanmamıştı - kullanımı sorunlara yolaçabilir\n"
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7334,7 +7315,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7342,7 +7323,7 @@ msgstr ""
 "Bu yazılımın böyle imzaları oluşturmak ve doğrulamak için resmi onaylı "
 "olmadığına dikkat ediniz.\n"
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7353,61 +7334,61 @@ msgstr ""
 "\"%s\"\n"
 "Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 msgid "Signature made "
 msgstr "İmza "
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr "[belirtilmeyen tarihte]"
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr " sertifika kimliği %08lX kullanılarak yapıldı\n"
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "sessiz"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr "veri çıktısını onaltılık kodlamayla basar"
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr "komut satırında verilen Assuan sunucu çalıştırılır"
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr "ek bağlantı kipi kullanılmaz"
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7415,161 +7396,165 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7577,19 +7562,19 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 msgid "usage: gpgconf [options] "
 msgstr "kullanımı: gpgconf [seçenekler] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr "Tek bileşen argümanı gerekiyor"
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Yönetici komutlarına izin verilmez\n"
@@ -7599,7 +7584,7 @@ msgstr "Yönetici komutlarına izin verilmez\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "yeterli bellek ayrılırken hata: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 msgid ""
 "@\n"
 "Commands:\n"
@@ -7609,35 +7594,35 @@ msgstr ""
 "Komutlar:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 msgid "decryption modus"
 msgstr "şifre çözme kipi"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 msgid "encryption modus"
 msgstr "şifreleme kipi"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr "araç sınıfı (Konfüçyüs)"
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 msgid "program filename"
 msgstr "program dosyaismi"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr "gizli anahtar dosyası (gerekli)"
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr "girdi dosyası ismi (std girdi öntanımlı)"
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
@@ -7647,126 +7632,145 @@ msgstr ""
 "[seçenekler...] KOMUT [girdi-dosyası]\n"
 "Basit bir simetrik şifreleme aracı çalıştırır\n"
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s yazmak için açılamadı: %s\n"
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "%s yazılırken hata: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 msgid "no --program option provided\n"
 msgstr "--program diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr "--keyfile diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "boru oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "pty oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "çatallanamadı: %s\n"
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv başarısız: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, c-format
 msgid "read failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty okuması başarısız: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid başarısız: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "alt süreç %i durumu ile çıktı\n"
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "ya %s verilmeli ya da %s\n"
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr "hiç sınıf sağlanmamış\n"
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "%s sınıfı desteklenmiyor\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
+
+#~ msgid "no running gpg-agent - starting one\n"
+#~ msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
+
+#~ msgid "can't connect to the agent - trying fall back\n"
+#~ msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cdf40871a..90389b299 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -19,154 +19,154 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|管理员 PIN"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "再次输入此 PIN："
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -177,40 +177,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "请输入密码\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -220,344 +220,349 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -570,7 +575,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -580,7 +585,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -592,434 +597,426 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[找不到用户标识]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "用户取消\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "yes"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签名头\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "多层明文签名\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1030,415 +1027,415 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "这是一把私钥！――真的要删除吗？(y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "信任度信息已被清除\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公钥“%s”有对应的私钥！\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "无法执行程序‘%s’：%s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "无法执行外部程序\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr "导出被标记为局部的密名"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "导出属性用户标识(一般为照片标识)"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "导出被标记为“敏感”的吊销密钥"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove the passphrase from exported subkeys"
 msgstr "从导出的子钥中删除所有密码"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove unusable parts from key during export"
 msgstr "导出时清除密钥中的不可用部分"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr "导出时尽可能清除密钥中的可选部分"
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡上——已跳过\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr "准备导出一把不受保护的子钥\n"
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "无法取消保护子钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "自动获取‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1446,132 +1443,132 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1581,47 +1578,47 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1629,7 +1626,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1649,17 +1646,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1669,7 +1666,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1677,560 +1674,560 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2238,7 +2235,7 @@ msgstr ""
 "语法：gpg [选项] [文件]\n"
 "用已知的受信任密钥来检查签名\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2247,7 +2244,7 @@ msgstr ""
 "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
 "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2257,16 +2254,16 @@ msgstr ""
 "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
 "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2289,7 +2286,7 @@ msgstr ""
 "\n"
 "第一把密钥(主钥)必须具有签名的能力。"
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2298,16 +2295,16 @@ msgstr ""
 "通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
 "下使用。请先咨询安全方面的专家。"
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2318,19 +2315,19 @@ msgstr ""
 "您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
 "――系统会尝试将给定值解释为时间间隔。"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "请输入密钥持有人的名字"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "请输入注释(可选项)"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2344,11 +2341,11 @@ msgstr ""
 "O  继续产生密钥。\n"
 "Q  中止产生密钥。"
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2410,11 +2407,11 @@ msgstr ""
 "\n"
 "如果您不知道应该选什么答案的话，就选“0”。"
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果您想要为所有用户标识签名的话就选“yes”"
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2422,11 +2419,11 @@ msgstr ""
 "如果您真的想要删除这个用户标识的话就回答“yes”。\n"
 "所有相关认证在此之后也会丢失！"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果可以删除这把子钥，请回答“yes”"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2436,7 +2433,7 @@ msgstr ""
 "因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
 "相当重要。"
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2447,13 +2444,13 @@ msgstr ""
 "直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
 "其他已经验证的密钥存在信任关系。"
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2466,7 +2463,7 @@ msgstr ""
 "只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
 "字可用的情况下才这么做。"
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2475,23 +2472,23 @@ msgstr ""
 "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 "字的时间戳都会增加一秒钟。\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "请给定要添加签名的文件名"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果可以覆盖这个文件，请回答“yes”"
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2499,7 +2496,7 @@ msgstr ""
 "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
 "号中的默认的文件名。"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2526,7 +2523,7 @@ msgstr ""
 "      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
 "      件地址已不再有效。\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2536,388 +2533,388 @@ msgstr ""
 "字简明扼要。\n"
 "键入一空行以结束输入。\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "导入被标记为局部的签名"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "导入时修复 PKS 公钥服务器导致的损坏"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "导入后不更新信任度数据库"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "导入私钥时创建对应的公钥"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "只接受对已有密钥的更新"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "导入后清除密钥中无用的部分"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "导入后尽可能清除密钥中的可选部分"
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签名：%lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      清除的签名：%lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2926,133 +2923,133 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[自身签名]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签名\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签名\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签名因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签名因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3063,17 +3060,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3082,45 +3079,45 @@ msgstr ""
 "请输入这份信任签名的深度。\n"
 "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签名。"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "可以为用户标识“%s”添加签名。"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "为其添加签名吗？(y/N)"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3129,75 +3126,75 @@ msgstr ""
 "“%s”的自身签名是 PGP 2.x 样\n"
 "式的签名。\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签名已经过期了。\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签名是一份本地签名。\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签名\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签名\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签名吗？(y/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签名\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3206,31 +3203,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3239,74 +3236,74 @@ msgstr ""
 "您真的确定要签名这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签名。\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签名不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签名不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签名会被标记成不可导出。\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签名会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3314,11 +3311,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3326,184 +3323,184 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3514,245 +3511,245 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3761,74 +3758,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3837,366 +3834,366 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4212,7 +4209,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4228,38 +4225,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4267,11 +4264,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4287,44 +4284,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4335,7 +4332,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4350,23 +4347,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4374,12 +4371,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4391,7 +4388,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4401,50 +4398,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4452,674 +4449,674 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "永不过期"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "关键签名策略："
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "签名策略："
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "关键首选公钥服务器："
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "关键签名注记："
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "签名注记："
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr "在搜索结果中包含已吊销的密钥"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr "按钥匙号搜索时包含子钥"
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr "不删除使用过的临时文件"
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "验证签名时自动下载密钥"
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "使用密钥中指定的首选公钥服务器 URL"
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "获取密钥时使用密钥上的 PKA 记录"
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5130,41 +5127,41 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5177,112 +5174,112 @@ msgstr ""
 "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
 "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作相片标识的JPEG文件名： "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N)"
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "“%s”不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q)"
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "吊销原因："
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "吊销注释："
 
 #  a string with valid answers
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "下列项目没有指定信任度：\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = 我不知道或我不作答\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我不相信\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我绝对相信\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr "  m = 回到主菜单\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = 退出\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5291,37 +5288,37 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被绝对信任的密钥的证书：\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "这把密钥有可能属于它所声称的持有者\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "这把密钥是属于我们的\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5330,105 +5327,105 @@ msgstr ""
 "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
 "己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不被信任的密钥！\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      这表明这个签名有可能是伪造的。\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "注意：验证过的签名者的地址是‘%s’\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "PKA 信息有效，信任级别调整到“完全”\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "PKA 信息无效，信任级别调整到“从不”\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签名很有可能是伪造的。\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5436,176 +5433,176 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名收件者。\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "对称加密算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "将被吊销，吊销者：\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(这是一把敏感的吊销密钥)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "已建立吊销证书。\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5623,241 +5620,241 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保护算法 %d%s 未被支持\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "无效的密码；请再试一次"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s……\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告：检测到弱密钥――请更换密码。\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "建立了弱密钥――正在重试\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：签名的子钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子钥 %s 交叉验证无效\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5866,341 +5863,341 @@ msgstr ""
 "# 已指定的信任度的清单，建立于 %s \n"
 "# (请用“gpg --import-ownertrust”导入这些信任度)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "列太长"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "冒号缺失"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "指纹无效"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "没有信任度"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长式钥匙号\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：受信任，已接受\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中重复出现\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6210,148 +6207,142 @@ msgstr ""
 "请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
@@ -6359,374 +6350,374 @@ msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "不允许导出私钥\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的密钥在："
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "生成一份吊销证书"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "这把密钥已经过期！"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA 指纹："
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "验证签名"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, fuzzy, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[未设定]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "错误：无效的响应。\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "错误：无效的响应。\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6737,316 +6728,316 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "生成密钥失败：%s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "已建立吊销证书。\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "首选项‘%s’重复\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "检查签名"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7057,137 +7048,127 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent 在此次舍话中无法使用\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "请选择您要使用的密钥种类：\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "生成一份吊销证书"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "无法存储指纹：%s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7198,13 +7179,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7212,246 +7193,250 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "签名建立于 %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的签名，来自于“%s”"
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "              亦即“%s”"
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太长"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
@@ -7461,7 +7446,7 @@ msgstr "不允许使用管理员命令\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7471,166 +7456,179 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [文件名]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "不支持远程调用\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent 在此次舍话中无法使用\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "请选择您要使用的密钥种类：\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1aa08bd7e..6f6360586 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-06-15 10:36+0200\n"
+"POT-Creation-Date: 2007-07-04 21:46+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -17,154 +17,154 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:198
+#: agent/call-pinentry.c:196
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: agent/call-pinentry.c:428
+#: agent/call-pinentry.c:426
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:431
+#: agent/call-pinentry.c:429
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:478
+#: agent/call-pinentry.c:476
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
+#: agent/call-pinentry.c:496 agent/call-pinentry.c:508
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:499
+#: agent/call-pinentry.c:497
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:505
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:510
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:524
+#: agent/call-pinentry.c:522
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:525
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:529
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
-#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3065
+#: g10/keygen.c:3094 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
-#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
-#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
+#: agent/command-ssh.c:700 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2560
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
+#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1770
+#: sm/gpgsm.c:1807 sm/gpgsm.c:1845 sm/qualified.c:72
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1615 agent/command-ssh.c:1633
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1624
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1644
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1694
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1709
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: agent/command-ssh.c:2016
+#: agent/command-ssh.c:2014
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/command-ssh.c:2351
+#: agent/command-ssh.c:2349
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2852
+#: agent/command-ssh.c:2850
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:217
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|Admin PIN"
 
-#: agent/divert-scd.c:277
+#: agent/divert-scd.c:275
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: agent/divert-scd.c:280
+#: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: agent/divert-scd.c:292
+#: agent/divert-scd.c:290
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: agent/genkey.c:90
+#: agent/genkey.c:88
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,40 +175,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:100
+#: agent/genkey.c:98
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: agent/genkey.c:101
+#: agent/genkey.c:99
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "請輸入密語\n"
 
-#: agent/genkey.c:146
+#: agent/genkey.c:144
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
+#: agent/genkey.c:146 agent/genkey.c:264 agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密語"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
-#: tools/symcryptrun.c:458
+#: agent/genkey.c:173 agent/genkey.c:291 agent/protect-tool.c:1202
+#: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:265
+#: agent/genkey.c:263
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:111 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -218,342 +218,347 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:105
+#: agent/gpg-agent.c:113 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:108
+#: agent/gpg-agent.c:114 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
-#: tools/gpgconf.c:69 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:115 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: scd/scdaemon.c:107 sm/gpgsm.c:336 tools/gpg-connect-agent.c:58
+#: tools/gpgconf.c:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:339
+#: agent/gpg-agent.c:116 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:108
+#: sm/gpgsm.c:337
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:111
+#: agent/gpg-agent.c:117 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:112
+#: agent/gpg-agent.c:118 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:119 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:121
+#: agent/gpg-agent.c:124 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:125
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
-#: tools/symcryptrun.c:168
+#: agent/gpg-agent.c:126 scd/scdaemon.c:120 sm/gpgsm.c:339
+#: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:128
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:131
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:134
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "更新信任資料庫"
 
-#: agent/gpg-agent.c:146
+#: agent/gpg-agent.c:142
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:144
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:151
+#: agent/gpg-agent.c:147
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:153
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:155
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:157
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:158
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:164
+#: agent/gpg-agent.c:160
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
-#: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
-#: tools/gpgconf.c:91 tools/symcryptrun.c:206
+#: agent/gpg-agent.c:256 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:203 sm/gpgsm.c:519 tools/gpg-connect-agent.c:124
+#: tools/gpgconf.c:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:261
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
+#: agent/gpg-agent.c:296 g10/gpg.c:916 scd/scdaemon.c:243 sm/gpgsm.c:633
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
-#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
+#: agent/gpg-agent.c:475 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: scd/scdaemon.c:337 sm/gpgsm.c:755 sm/gpgsm.c:758 tools/symcryptrun.c:1026
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
+#: agent/gpg-agent.c:568 g10/gpg.c:2025 scd/scdaemon.c:413 sm/gpgsm.c:849
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
-#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
+#: agent/gpg-agent.c:573 agent/gpg-agent.c:1137 g10/gpg.c:2029
+#: scd/scdaemon.c:418 sm/gpgsm.c:853 tools/symcryptrun.c:959
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
+#: agent/gpg-agent.c:581 g10/gpg.c:2036 scd/scdaemon.c:426 sm/gpgsm.c:860
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
-#: g10/plaintext.c:164
+#: agent/gpg-agent.c:907 g10/plaintext.c:140 g10/plaintext.c:145
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
-#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
-#: g10/openfile.c:431 scd/scdaemon.c:904
+#: agent/gpg-agent.c:1207 agent/gpg-agent.c:1333 agent/gpg-agent.c:1337
+#: agent/gpg-agent.c:1378 agent/gpg-agent.c:1382 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
+#: agent/gpg-agent.c:1221 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
+#: agent/gpg-agent.c:1247 scd/scdaemon.c:961
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1265 agent/gpg-agent.c:1281
+#, fuzzy
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "gpg-agent 在此階段無法使用\n"
+
+#: agent/gpg-agent.c:1295 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
+#: agent/gpg-agent.c:1307 scd/scdaemon.c:998
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1313 scd/scdaemon.c:1004
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
+#: agent/gpg-agent.c:1341 agent/gpg-agent.c:1388 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1354
+#: agent/gpg-agent.c:1394
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1358
+#: agent/gpg-agent.c:1398
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1509
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1465
+#: agent/gpg-agent.c:1514
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1482
+#: agent/gpg-agent.c:1531
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487
+#: agent/gpg-agent.c:1536
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
+#: agent/gpg-agent.c:1640 scd/scdaemon.c:1130
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
+#: agent/gpg-agent.c:1746 scd/scdaemon.c:1197
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1769
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
-#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
+#: agent/gpg-agent.c:1780 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:751
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
-#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1793 common/simple-pwquery.c:344
+#: tools/gpg-connect-agent.c:762
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:98
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:149
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/protect-tool.c:153
+#: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1187
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1190
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1193
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1198
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "錯誤的密語"
 
-#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
+#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:133 agent/trustlist.c:321
+#: agent/trustlist.c:131 agent/trustlist.c:319
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: agent/trustlist.c:148
+#: agent/trustlist.c:146
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/trustlist.c:168 agent/trustlist.c:176
+#: agent/trustlist.c:166 agent/trustlist.c:174
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:182
+#: agent/trustlist.c:180
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: agent/trustlist.c:217
+#: agent/trustlist.c:215
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: agent/trustlist.c:243 agent/trustlist.c:250
+#: agent/trustlist.c:241 agent/trustlist.c:248
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:282
+#: agent/trustlist.c:280
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: agent/trustlist.c:383 agent/trustlist.c:422
+#: agent/trustlist.c:381 agent/trustlist.c:420
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +571,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:498
+#: agent/trustlist.c:496
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +581,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:507
+#: agent/trustlist.c:505
 msgid "Correct"
 msgstr ""
 
@@ -588,433 +593,425 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:527
+#: agent/trustlist.c:525
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:533
+#: agent/trustlist.c:531
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:285 common/exechelp.c:376
+#: common/exechelp.c:302 common/exechelp.c:393
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: common/exechelp.c:352 common/exechelp.c:409
+#: common/exechelp.c:369 common/exechelp.c:426
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: common/exechelp.c:388 common/exechelp.c:546
+#: common/exechelp.c:405 common/exechelp.c:635
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:444 common/exechelp.c:487
+#: common/exechelp.c:461 common/exechelp.c:504
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:452
+#: common/exechelp.c:469
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:498
+#: common/exechelp.c:475 common/exechelp.c:515
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:493
+#: common/exechelp.c:510
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:504
+#: common/exechelp.c:521
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/http.c:1627
+#: common/http.c:1625
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: common/http.c:1671
+#: common/http.c:1669
 #, fuzzy
 msgid "host not found"
 msgstr "[找不到使用者 ID]"
 
-#: common/simple-pwquery.c:317
+#: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: common/simple-pwquery.c:378
+#: common/simple-pwquery.c:376
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:387
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:399
+#: common/simple-pwquery.c:397
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
+#: common/simple-pwquery.c:560 common/simple-pwquery.c:656
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "由使用者取消了\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
+#: common/simple-pwquery.c:575 common/simple-pwquery.c:662
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: common/sysutils.c:88 g10/misc.c:136
+#: common/sysutils.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: common/sysutils.c:183
+#: common/sysutils.c:194
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: common/sysutils.c:215
+#: common/sysutils.c:226
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:33 common/yesno.c:70
+#: common/yesno.c:31 common/yesno.c:68
 msgid "yes"
 msgstr "yes"
 
-#: common/yesno.c:34 common/yesno.c:75
+#: common/yesno.c:32 common/yesno.c:73
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:36 common/yesno.c:72
+#: common/yesno.c:34 common/yesno.c:70
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:37 common/yesno.c:76
+#: common/yesno.c:35 common/yesno.c:74
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:74
+#: common/yesno.c:72
 msgid "quit"
 msgstr "quit"
 
-#: common/yesno.c:77
+#: common/yesno.c:75
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:109
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:113
+#: common/yesno.c:111
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: common/yesno.c:114
+#: common/yesno.c:112
 msgid "oO"
 msgstr "oO"
 
-#: common/yesno.c:115
+#: common/yesno.c:113
 msgid "cC"
 msgstr "cC"
 
-#: common/miscellaneous.c:73
+#: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:76
+#: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:368
+#: g10/armor.c:366
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:407
+#: g10/armor.c:405
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:418
+#: g10/armor.c:416
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:429
+#: g10/armor.c:427
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:481
+#: g10/armor.c:479
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:616
+#: g10/armor.c:614
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:628
+#: g10/armor.c:626
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:782 g10/armor.c:1392
+#: g10/armor.c:780 g10/armor.c:1390
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:823
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:859
+#: g10/armor.c:857
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:867
+#: g10/armor.c:865
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:871 g10/armor.c:1429
+#: g10/armor.c:869 g10/armor.c:1427
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:891
+#: g10/armor.c:889
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:893
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1206
+#: g10/armor.c:1204
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1211
+#: g10/armor.c:1209
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1213
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/build-packet.c:978
+#: g10/build-packet.c:976
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/build-packet.c:990
+#: g10/build-packet.c:988
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/build-packet.c:996
+#: g10/build-packet.c:994
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/build-packet.c:1014
+#: g10/build-packet.c:1012
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1048 g10/build-packet.c:1057
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
 
-#: g10/build-packet.c:1079 g10/build-packet.c:1081
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/call-agent.c:99 sm/call-agent.c:106
-msgid "no running gpg-agent - starting one\n"
-msgstr ""
-
-#: g10/call-agent.c:160 sm/call-agent.c:171
-msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
-
-#: g10/card-util.c:64 g10/card-util.c:307
+#: g10/card-util.c:62 g10/card-util.c:305
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:69
+#: g10/card-util.c:67
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
-#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
+#: g10/card-util.c:75 g10/card-util.c:1401 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/keygen.c:2747 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
-#: g10/keygen.c:1617
+#: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1548
+#: g10/keygen.c:1615
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:217 g10/card-util.c:267
+#: g10/card-util.c:215 g10/card-util.c:265
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:415
+#: g10/card-util.c:413
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:442
+#: g10/card-util.c:440
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:518
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:522
+#: g10/card-util.c:520
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:524
+#: g10/card-util.c:522
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:541
+#: g10/card-util.c:539
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:543
+#: g10/card-util.c:541
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:561
+#: g10/card-util.c:559
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:582
+#: g10/card-util.c:580
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:590
+#: g10/card-util.c:588
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:696
+#: g10/card-util.c:694
 msgid "Login data (account name): "
 msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:706
+#: g10/card-util.c:704
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:765
+#: g10/card-util.c:763
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:775
+#: g10/card-util.c:773
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:793
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:803
+#: g10/card-util.c:801
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:812
+#: g10/card-util.c:810
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:833
+#: g10/card-util.c:831
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:847
+#: g10/card-util.c:845
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:868
+#: g10/card-util.c:866
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:891
+#: g10/card-util.c:889
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:940
+#: g10/card-util.c:938
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:947
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:1034
+#: g10/card-util.c:1032
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1055 g10/card-util.c:1064
+#: g10/card-util.c:1053 g10/card-util.c:1062
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1076
+#: g10/card-util.c:1074
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1085
+#: g10/card-util.c:1083
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1025,419 +1022,419 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1120
+#: g10/card-util.c:1118
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1120 g10/card-util.c:1201
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1121 g10/card-util.c:1203
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1122 g10/card-util.c:1205
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
+#: g10/card-util.c:1138 g10/card-util.c:1221 g10/keyedit.c:945
+#: g10/keygen.c:1552 g10/keygen.c:1580 g10/keygen.c:1654 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1200
+#: g10/card-util.c:1198
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1235
+#: g10/card-util.c:1233
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1238
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1245
+#: g10/card-util.c:1243
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1364
+#: g10/card-util.c:1314 g10/keyedit.c:1362
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1318
+#: g10/card-util.c:1316
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1367
+#: g10/card-util.c:1317 g10/keyedit.c:1365
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1325
+#: g10/card-util.c:1323
 msgid "change URL to retrieve key"
 msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1326
+#: g10/card-util.c:1324
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change the login name"
 msgstr "變更登入姓名"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1636
+#: g10/card-util.c:1452 g10/keyedit.c:1634
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1492
+#: g10/card-util.c:1490
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1523
+#: g10/card-util.c:1521
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1525
+#: g10/card-util.c:1523
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2257
+#: g10/card-util.c:1597 g10/keyedit.c:2255
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:112 g10/encode.c:892
+#: g10/decrypt.c:110 g10/encode.c:890
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:166 g10/gpg.c:3860 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
-#: g10/revoke.c:234 g10/revoke.c:479
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非妳用指紋指定了金鑰)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "主觀信任資訊已經被清除\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:228 g10/sign.c:1300
+#: g10/encode.c:226 g10/sign.c:1296
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: g10/encode.c:234
+#: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encode.c:248
+#: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用編密法 %s\n"
 
-#: g10/encode.c:258 g10/encode.c:579
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
+#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
 
-#: g10/encode.c:487
+#: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中, 妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:510
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
-#: g10/encode.c:543
+#: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
-#: g10/encode.c:561
+#: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:671 g10/sign.c:970
+#: g10/encode.c:669 g10/sign.c:966
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:767
+#: g10/encode.c:765
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
+#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:864
+#: g10/encode.c:862
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:288
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:292
+#: g10/encr-data.c:94 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:134 sm/decrypt.c:128
+#: g10/encr-data.c:132 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:146
+#: g10/encr-data.c:144
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
-#: g10/exec.c:51
+#: g10/exec.c:49
 msgid "no remote program execution supported\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: g10/exec.c:315
+#: g10/exec.c:313
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
-#: g10/exec.c:345
+#: g10/exec.c:343
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
-#: g10/exec.c:423
+#: g10/exec.c:421
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "無法執行程式 `%s': %s\n"
 
-#: g10/exec.c:426
+#: g10/exec.c:424
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "無法執行 shell `%s': %s\n"
 
-#: g10/exec.c:511
+#: g10/exec.c:509
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:520 g10/exec.c:586
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
-#: g10/exec.c:537
+#: g10/exec.c:535
 msgid "unable to execute external program\n"
 msgstr "無法執行外部程式\n"
 
-#: g10/exec.c:554
+#: g10/exec.c:552
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:597 g10/exec.c:604
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 
-#: g10/exec.c:611
+#: g10/exec.c:609
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/export.c:71
+#: g10/export.c:69
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "從金鑰中清除無法使用的部分"
 
-#: g10/export.c:73
+#: g10/export.c:71
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:75
+#: g10/export.c:73
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:340
+#: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:369
+#: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:377
+#: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:388
+#: g10/export.c:386
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/export.c:539
+#: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:562
+#: g10/export.c:560
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:586
+#: g10/export.c:584
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:635
+#: g10/export.c:633
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/getkey.c:153
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:176
+#: g10/getkey.c:174
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
-#: g10/getkey.c:1004
+#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
+#: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1836
+#: g10/getkey.c:1834
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2393 g10/keyedit.c:3723
+#: g10/getkey.c:2391 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2624
+#: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2671
+#: g10/getkey.c:2669
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
+#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1445,132 +1442,132 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:370
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:371
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:373 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:374 sm/gpgsm.c:247
+#: g10/gpg.c:373 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:376 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:378 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:382 sm/gpgsm.c:252
+#: g10/gpg.c:381 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:383
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:384
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:387 sm/gpgsm.c:254
+#: g10/gpg.c:386 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:387
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:388
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:390
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:391
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:392
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:393
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:394
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:396
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:398 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:399 sm/gpgsm.c:260
+#: g10/gpg.c:398 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:400
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:402
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:406
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:409
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:410
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:411
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:420
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:427
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:431 sm/gpgsm.c:264
+#: g10/gpg.c:430 sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:58 tools/gpgconf.c:66 tools/symcryptrun.c:159
+#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:277
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1580,47 +1577,47 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:281
+#: g10/gpg.c:434 sm/gpgsm.c:279
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:437 sm/gpgsm.c:293
+#: g10/gpg.c:436 sm/gpgsm.c:291
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:448 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:327
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:449 sm/gpgsm.c:332
+#: g10/gpg.c:448 sm/gpgsm.c:330
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:334
+#: g10/gpg.c:453 sm/gpgsm.c:332
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
+#: g10/gpg.c:467 sm/gpgsm.c:335 tools/gpgconf.c:66
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
+#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:345 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:481
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:523
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:524
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:554 sm/gpgsm.c:395
+#: g10/gpg.c:553 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1628,7 +1625,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:557 sm/gpgsm.c:398
+#: g10/gpg.c:556 sm/gpgsm.c:396
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1648,15 +1645,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:751 g10/gpgv.c:96
+#: g10/gpg.c:750 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:768
+#: g10/gpg.c:767
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:771
+#: g10/gpg.c:770
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1666,7 +1663,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:782 sm/gpgsm.c:534
+#: g10/gpg.c:781 sm/gpgsm.c:532
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1674,567 +1671,567 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:785
+#: g10/gpg.c:784
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:792 g10/keyedit.c:2323
+#: g10/gpg.c:791 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:799
+#: g10/gpg.c:798
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2367
+#: g10/gpg.c:805 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:876
+#: g10/gpg.c:875
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1046 sm/gpgsm.c:671
+#: g10/gpg.c:1045 sm/gpgsm.c:669
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1063
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1260
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1263
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1266
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1272
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1275
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1278
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1284
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1287
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1290
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1296
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1299
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1302
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1446
+#: g10/gpg.c:1445
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1542
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1544
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1548
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1552
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1554
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1556
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1558
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1560
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1562
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1564
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1824
+#: g10/gpg.c:1827
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1980
+#: g10/gpg.c:1983
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
+#: g10/gpg.c:2243 g10/gpg.c:2884 g10/gpg.c:2896
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2401 g10/gpg.c:2413
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2495
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
+#: g10/gpg.c:2518 g10/gpg.c:2713 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2530
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2533
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2540
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2543
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2550
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2553
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2560
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2563
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2571
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2573
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2575
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2577
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2581
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2583
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2585
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2587
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2781
+#: g10/gpg.c:2784
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2784
+#: g10/gpg.c:2787
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2870 sm/gpgsm.c:1221
+#: g10/gpg.c:2873 sm/gpgsm.c:1220
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2877
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2883
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2889
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2901
+#: g10/gpg.c:2904
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2915
+#: g10/gpg.c:2918
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2924
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2927
+#: g10/gpg.c:2930
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2940
+#: g10/gpg.c:2943
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
+#: g10/gpg.c:3009 g10/gpg.c:3033 sm/gpgsm.c:1276
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
+#: g10/gpg.c:3015 g10/gpg.c:3039 sm/gpgsm.c:1284
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3021
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3027
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3042
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3044
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3046
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3048
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3050
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3053
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3057
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3064
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3073
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3074
+#: g10/gpg.c:3077
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3081
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3111
+#: g10/gpg.c:3114
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3161
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3166
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3171
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3263
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3274
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3295
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3299
+#: g10/gpg.c:3302
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3304
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3311
+#: g10/gpg.c:3314
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3327
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3329
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3332
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3350
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3383
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3412
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3437
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3445
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3470
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3552
+#: g10/gpg.c:3555
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3557
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3559
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3567
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3580
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3628
+#: g10/gpg.c:3631
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3639
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3726
+#: g10/gpg.c:3729
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3846
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3847
+#: g10/gpg.c:3850
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4159
+#: g10/gpg.c:4162
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4164
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4194
+#: g10/gpg.c:4197
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:75
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:370
+#: g10/gpgv.c:75 sm/gpgsm.c:368
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:100
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2242,7 +2239,7 @@ msgstr ""
 "語法: gpg [選項] [檔案]\n"
 "用已知的受信任金鑰來檢查簽章\n"
 
-#: g10/helptext.c:51
+#: g10/helptext.c:49
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2251,7 +2248,7 @@ msgstr ""
 "在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
 "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
-#: g10/helptext.c:57
+#: g10/helptext.c:55
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2262,16 +2259,16 @@ msgstr ""
 "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
 "金鑰設成被徹底信任的\n"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:62
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:66
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:70
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2295,7 +2292,7 @@ msgstr ""
 "\n"
 "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
 
-#: g10/helptext.c:86
+#: g10/helptext.c:84
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2305,16 +2302,16 @@ msgstr ""
 "這個演算法應該祇被用於特定的情況下.\n"
 "請先聯絡妳的安全專家."
 
-#: g10/helptext.c:93
+#: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰的尺寸"
 
-#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
-#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
+#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
+#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
-#: g10/helptext.c:107
+#: g10/helptext.c:105
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2325,19 +2322,19 @@ msgstr ""
 "妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
 "反之, 系統會試著把給定的數值中斷成若干片段."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:117
 msgid "Enter the name of the key holder"
 msgstr "請輸入金鑰持有人的名字"
 
-#: g10/helptext.c:124
+#: g10/helptext.c:122
 msgid "please enter an optional but highly suggested email address"
 msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
 
-#: g10/helptext.c:128
+#: g10/helptext.c:126
 msgid "Please enter an optional comment"
 msgstr "請輸入選用的註釋"
 
-#: g10/helptext.c:133
+#: g10/helptext.c:131
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2351,11 +2348,11 @@ msgstr ""
 "O  繼續產生金鑰.\n"
 "Q  中止產生金鑰."
 
-#: g10/helptext.c:142
+#: g10/helptext.c:140
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
 
-#: g10/helptext.c:150
+#: g10/helptext.c:148
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2424,11 +2421,11 @@ msgstr ""
 "\n"
 "如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
 
-#: g10/helptext.c:188
+#: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
 
-#: g10/helptext.c:192
+#: g10/helptext.c:190
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2436,11 +2433,11 @@ msgstr ""
 "如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
 "所有的憑證在那之後也都會失去!"
 
-#: g10/helptext.c:197
+#: g10/helptext.c:195
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:200
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2450,7 +2447,7 @@ msgstr ""
 "因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
 "會是一件相當重要的事."
 
-#: g10/helptext.c:207
+#: g10/helptext.c:205
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2461,13 +2458,13 @@ msgstr ""
 "直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
 "其他已經驗證的金鑰建立了一個信任連結."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
 
-#: g10/helptext.c:217
+#: g10/helptext.c:215
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2481,7 +2478,7 @@ msgstr ""
 "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
 "個還可用的情況下纔這麼做."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:223
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2490,23 +2487,23 @@ msgstr ""
 "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
 "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
 
-#: g10/helptext.c:232
+#: g10/helptext.c:230
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:236
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
 
-#: g10/helptext.c:242
+#: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
 msgstr "請給定簽章所要套用的檔案名稱"
 
-#: g10/helptext.c:247
+#: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
 
-#: g10/helptext.c:252
+#: g10/helptext.c:250
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2514,7 +2511,7 @@ msgstr ""
 "請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
 "就會使用預設的檔案 (顯示在括號中)."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:256
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2542,7 +2539,7 @@ msgstr ""
 "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
 "      這通常用來表示某個電子郵件位址不再有效了.\n"
 
-#: g10/helptext.c:274
+#: g10/helptext.c:272
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2552,391 +2549,391 @@ msgstr ""
 "請讓這段文字保持簡明扼要.\n"
 "鍵入空白列以結束這段文字.\n"
 
-#: g10/helptext.c:289
+#: g10/helptext.c:287
 msgid "No help available"
 msgstr "沒有可用的說明"
 
-#: g10/helptext.c:297
+#: g10/helptext.c:295
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "更新信任資料庫"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "從金鑰中清除無法使用的部分"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:271
+#: g10/import.c:269
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:280
+#: g10/import.c:278
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:297
+#: g10/import.c:295
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:297
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:300
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:304 sm/import.c:113
+#: g10/import.c:302 sm/import.c:111
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:310 sm/import.c:117
+#: g10/import.c:308 sm/import.c:115
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:318 sm/import.c:117
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:326 sm/import.c:125
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:328
+#: g10/import.c:326
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      已被清除掉的簽章: %lu\n"
 
-#: g10/import.c:330
+#: g10/import.c:328
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已被清除掉的使用者 ID: %lu\n"
 
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:612
+#: g10/import.c:610
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:627
+#: g10/import.c:625
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:639
+#: g10/import.c:637
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:652
+#: g10/import.c:650
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:654
+#: g10/import.c:652
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:678
+#: g10/import.c:676
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:728 g10/import.c:1126
+#: g10/import.c:726 g10/import.c:1124
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:757
+#: g10/import.c:755
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:772
+#: g10/import.c:770
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:778
+#: g10/import.c:776
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:780
+#: g10/import.c:778
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:790 g10/import.c:1248
+#: g10/import.c:788 g10/import.c:1246
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:796
+#: g10/import.c:794
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:805
+#: g10/import.c:803
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:814 g10/import.c:909 g10/import.c:1166 g10/import.c:1309
-#: g10/import.c:2371 g10/import.c:2393
+#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
+#: g10/import.c:2369 g10/import.c:2391
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:833
+#: g10/import.c:831
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:857
+#: g10/import.c:855
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:874 g10/import.c:1266
+#: g10/import.c:872 g10/import.c:1264
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:882 g10/import.c:1273
+#: g10/import.c:880 g10/import.c:1271
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:919
+#: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:922
+#: g10/import.c:920
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:925
+#: g10/import.c:923
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:928
+#: g10/import.c:926
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:931
+#: g10/import.c:929
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:934
+#: g10/import.c:932
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:937
+#: g10/import.c:935
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:940
+#: g10/import.c:938
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:943
+#: g10/import.c:941
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:946
+#: g10/import.c:944
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:969
+#: g10/import.c:967
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1130
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1141
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1160 g10/import.c:2386
+#: g10/import.c:1158 g10/import.c:2384
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1171
+#: g10/import.c:1169
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1201
+#: g10/import.c:1199
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1211
+#: g10/import.c:1209
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1241
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1284
+#: g10/import.c:1282
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1314
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1380
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1397
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1397
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1417
+#: g10/import.c:1415
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1428 g10/import.c:1478
+#: g10/import.c:1426 g10/import.c:1476
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1428
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1445
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1467
+#: g10/import.c:1465
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1478
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1495
+#: g10/import.c:1493
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1537
+#: g10/import.c:1535
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1558
+#: g10/import.c:1556
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2945,133 +2942,133 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1585
+#: g10/import.c:1583
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1595
+#: g10/import.c:1593
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1612
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1624
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1634
+#: g10/import.c:1632
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1734
+#: g10/import.c:1732
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1796
+#: g10/import.c:1794
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1810
+#: g10/import.c:1808
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1869
+#: g10/import.c:1867
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1903
+#: g10/import.c:1901
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2290
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2298
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2302
+#: g10/import.c:2300
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
-#: g10/keydb.c:170
+#: g10/keydb.c:168
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keydb.c:176
+#: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
-#: g10/keydb.c:317 g10/keydb.c:320
+#: g10/keydb.c:315 g10/keydb.c:318
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "金鑰區塊資源 `%s': %s\n"
 
-#: g10/keydb.c:699
+#: g10/keydb.c:697
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:268
+#: g10/keyedit.c:266
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:346 g10/keylist.c:390
+#: g10/keyedit.c:344 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:392
+#: g10/keyedit.c:346 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:394
+#: g10/keyedit.c:348 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:396
+#: g10/keyedit.c:350 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:398
+#: g10/keyedit.c:352 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:356 g10/keylist.c:400
+#: g10/keyedit.c:354 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:356
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:358
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:261
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3081,17 +3078,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:273
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:421 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:438
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3101,45 +3098,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:454
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1755
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1753
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1759
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3148,11 +3145,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3161,11 +3158,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3174,53 +3171,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:824
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:842
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:848
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:888
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:890
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -3229,31 +3226,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:932
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3262,74 +3259,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:963
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:969
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:977
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1001
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1006
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1011
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1021
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4799 g10/keyedit.c:4890 g10/keyedit.c:4954
-#: g10/keyedit.c:5015 g10/sign.c:352
+#: g10/keyedit.c:1066 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:348
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1131
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3401
+#: g10/keyedit.c:1142 g10/keygen.c:3399
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
+#: g10/keyedit.c:1146 g10/keygen.c:3387 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3404
+#: g10/keyedit.c:1150 g10/keygen.c:3402
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3408
+#: g10/keyedit.c:1154 g10/keygen.c:3406
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1178
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1184
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3337,11 +3334,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1201 g10/keygen.c:2069
+#: g10/keyedit.c:1199 g10/keygen.c:2067
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1206
+#: g10/keyedit.c:1204
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3349,186 +3346,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1207
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1278
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1367
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1368
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1370
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1372
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1399
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1403
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1405
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1407
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1417
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1419
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1421
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1426
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1441
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1443
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1445
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1450
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1451
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1452
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1453
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1457
+#: g10/keyedit.c:1455
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1581
+#: g10/keyedit.c:1579
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1597
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1680
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1688
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1709
+#: g10/keyedit.c:1707
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3539,154 +3536,154 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1747
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1768
+#: g10/keyedit.c:1766
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1773
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1784
+#: g10/keyedit.c:1782
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1805
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1829 g10/keyedit.c:1849 g10/keyedit.c:2015
+#: g10/keyedit.c:1827 g10/keyedit.c:1847 g10/keyedit.c:2013
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1829
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1833
+#: g10/keyedit.c:1831
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1832
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1882
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1896
+#: g10/keyedit.c:1894
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1922
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1936
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1953
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1979
+#: g10/keyedit.c:1977
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1980
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1981
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2016
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2017
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2035
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2048
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2142
+#: g10/keyedit.c:2140
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2148
+#: g10/keyedit.c:2146
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2150
+#: g10/keyedit.c:2148
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2216
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2219
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2229
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2238
+#: g10/keyedit.c:2236
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2243
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2343
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2407
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2422 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2430 g10/keyedit.c:2431
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3694,73 +3691,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2641
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2700
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2727
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
-#: g10/keylist.c:194 g10/keyserver.c:523
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
+#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2748 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2771
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2778
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2806 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2830
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3768,17 +3765,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
+#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
+#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2961
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3786,7 +3783,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3795,74 +3792,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3362
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3033
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3187
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3193
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3244 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3246
+#: g10/keyedit.c:3244
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3254
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3260
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3263
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3871,365 +3868,365 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3388
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3413
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3450
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3546
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3611
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3684
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3852
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3891 g10/keyedit.c:4001 g10/keyedit.c:4121 g10/keyedit.c:4262
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4062
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4142
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4143
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4205
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4354
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4418
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4476
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4643 g10/keyedit.c:4707 g10/keyedit.c:4750
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4708
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4715
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4737
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4857
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4938
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5000
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5095
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:875
+#: g10/keygen.c:873
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:914
+#: g10/keygen.c:912
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:962
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2948
+#: g10/keygen.c:1123 g10/keygen.c:1237 g10/keygen.c:1242 g10/keygen.c:1375
+#: g10/keygen.c:2946
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
+#: g10/keygen.c:1128 g10/keygen.c:1248 g10/keygen.c:1380 g10/keygen.c:2952
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1274
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1492
+#: g10/keygen.c:1490
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1495
+#: g10/keygen.c:1493
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1498
+#: g10/keygen.c:1496
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1501
+#: g10/keygen.c:1499
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1509
+#: g10/keygen.c:1507
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1526
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1535
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1540
+#: g10/keygen.c:1538
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1543
+#: g10/keygen.c:1541
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1546
+#: g10/keygen.c:1544
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1602
+#: g10/keygen.c:1600
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1604
+#: g10/keygen.c:1602
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1605
+#: g10/keygen.c:1603
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1607
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1609
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1608
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1614
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1683
+#: g10/keygen.c:1681
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1698
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1714
+#: g10/keygen.c:1712
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1718
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1725 g10/keygen.c:1730
+#: g10/keygen.c:1723 g10/keygen.c:1728
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1777
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4245,7 +4242,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1790
+#: g10/keygen.c:1788
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4261,38 +4258,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1811
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1818
+#: g10/keygen.c:1816
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1836
+#: g10/keygen.c:1834
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1843
+#: g10/keygen.c:1841
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1844
+#: g10/keygen.c:1842
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1847
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1850
+#: g10/keygen.c:1848
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1854
+#: g10/keygen.c:1852
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4300,11 +4297,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1859
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1884
+#: g10/keygen.c:1882
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4319,44 +4316,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1895
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1903
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1905
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1909
+#: g10/keygen.c:1907
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1915
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1921
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1929
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1935
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4367,7 +4364,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1968
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -4382,23 +4379,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1986
+#: g10/keygen.c:1984
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1994
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1995
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2016
+#: g10/keygen.c:2014
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2055
+#: g10/keygen.c:2053
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4406,12 +4403,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2070
+#: g10/keygen.c:2068
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2074
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4423,7 +4420,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2098
+#: g10/keygen.c:2096
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4434,50 +4431,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2888 g10/keygen.c:2915
+#: g10/keygen.c:2886 g10/keygen.c:2913
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:3108 g10/keygen.c:3253
+#: g10/keygen.c:3106 g10/keygen.c:3251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3110 g10/keygen.c:3256
+#: g10/keygen.c:3108 g10/keygen.c:3254
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3113 g10/keygen.c:3259
+#: g10/keygen.c:3111 g10/keygen.c:3257
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3242
+#: g10/keygen.c:3240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3248
+#: g10/keygen.c:3246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3266
+#: g10/keygen.c:3264
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3273
+#: g10/keygen.c:3271
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3296
+#: g10/keygen.c:3294
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3307
+#: g10/keygen.c:3305
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4485,677 +4482,677 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
+#: g10/keygen.c:3317 g10/keygen.c:3452 g10/keygen.c:3568
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
+#: g10/keygen.c:3370 g10/keygen.c:3503 g10/sign.c:273
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:275
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3383 g10/keygen.c:3518
+#: g10/keygen.c:3381 g10/keygen.c:3516
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3422 g10/keygen.c:3551
+#: g10/keygen.c:3420 g10/keygen.c:3549
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3714
+#: g10/keygen.c:3712
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3762
+#: g10/keygen.c:3760
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3788
+#: g10/keygen.c:3786
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "永遠不過期"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "關鍵簽章原則: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "簽章原則: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "關鍵簽章標記: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "簽章標記: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1506
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1506
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1515
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1521 g10/keylist.c:1525
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1592
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1249
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1256
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1259
+#: g10/keyring.c:1257
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1258
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全性裂縫\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1380
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "正在快取鑰匙圈 `%s'\n"
 
-#: g10/keyring.c:1428
+#: g10/keyring.c:1426
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1440
+#: g10/keyring.c:1438
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1512
+#: g10/keyring.c:1510
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:73
+#: g10/keyserver.c:71
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:72
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:76
+#: g10/keyserver.c:74
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:82
+#: g10/keyserver.c:80
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:84
+#: g10/keyserver.c:82
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyserver.c:86
+#: g10/keyserver.c:84
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:152
+#: g10/keyserver.c:150
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:535
+#: g10/keyserver.c:533
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:736
+#: g10/keyserver.c:734
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:820 g10/keyserver.c:1442
+#: g10/keyserver.c:818 g10/keyserver.c:1440
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:918
+#: g10/keyserver.c:916
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:920
+#: g10/keyserver.c:918
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1161
+#: g10/keyserver.c:1159
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1165
+#: g10/keyserver.c:1163
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1189
+#: g10/keyserver.c:1187
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1192
+#: g10/keyserver.c:1190
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1345
+#: g10/keyserver.c:1343
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1349
+#: g10/keyserver.c:1347
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1390
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1395
+#: g10/keyserver.c:1393
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1402 g10/keyserver.c:1498
+#: g10/keyserver.c:1400 g10/keyserver.c:1496
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1450
+#: g10/keyserver.c:1448
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1459
+#: g10/keyserver.c:1457
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1521 g10/keyserver.c:2049
+#: g10/keyserver.c:1519 g10/keyserver.c:2047
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1525
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1539
+#: g10/keyserver.c:1537
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1542
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1550
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1559
+#: g10/keyserver.c:1557
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1564
+#: g10/keyserver.c:1562
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1573
+#: g10/keyserver.c:1571
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1598 g10/keyserver.c:1632
+#: g10/keyserver.c:1596 g10/keyserver.c:1630
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1891
+#: g10/keyserver.c:1889
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1911
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1915
+#: g10/keyserver.c:1913
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/keyserver.c:1971
+#: g10/keyserver.c:1969
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1975
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:233
+#: g10/mainproc.c:231
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:286
+#: g10/mainproc.c:284
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:296
+#: g10/mainproc.c:294
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:360
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:417
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:456 g10/pkclist.c:219
+#: g10/mainproc.c:454 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:458
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:472
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:486
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:488
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:520 g10/mainproc.c:542
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:530
+#: g10/mainproc.c:528
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:561
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:565
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:578
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:584
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:609
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:697
+#: g10/mainproc.c:695
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:838
+#: g10/mainproc.c:836
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1191 g10/mainproc.c:1228
+#: g10/mainproc.c:1189 g10/mainproc.c:1226
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1466
+#: g10/mainproc.c:1464
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1573
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1586
+#: g10/mainproc.c:1584
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1585
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1589
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1609
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1742 g10/mainproc.c:1790
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1796
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1828
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1928
+#: g10/mainproc.c:1926
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1931
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1934
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1935
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1936
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1938 g10/trustdb.c:531
+#: g10/mainproc.c:1936 g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1958
+#: g10/mainproc.c:1956
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
+#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2083
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2093
+#: g10/mainproc.c:2091
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2158
+#: g10/mainproc.c:2156
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2168
+#: g10/mainproc.c:2166
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
+#: g10/misc.c:109 g10/misc.c:137 g10/misc.c:209
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:221
+#: g10/misc.c:174
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:335
+#: g10/misc.c:288
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:350
+#: g10/misc.c:303
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:365
+#: g10/misc.c:318
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:370
+#: g10/misc.c:323
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:489
+#: g10/misc.c:414
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:490 g10/sig-check.c:109
+#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:650
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:729
+#: g10/misc.c:654
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:731
+#: g10/misc.c:656
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:738
+#: g10/misc.c:663
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:748
+#: g10/misc.c:673
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:751
+#: g10/misc.c:676
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:812
+#: g10/misc.c:737
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:837
+#: g10/misc.c:762
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:947
+#: g10/misc.c:872
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1122
+#: g10/misc.c:1047
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1147
+#: g10/misc.c:1072
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: g10/openfile.c:91
+#: g10/openfile.c:89
 #, c-format
 msgid "File `%s' exists. "
 msgstr "檔案 `%s' 存在. "
 
-#: g10/openfile.c:95
+#: g10/openfile.c:93
 msgid "Overwrite? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/openfile.c:128
+#: g10/openfile.c:126
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: 未知的副檔名\n"
 
-#: g10/openfile.c:152
+#: g10/openfile.c:150
 msgid "Enter new filename"
 msgstr "請輸入新的檔名"
 
-#: g10/openfile.c:197
+#: g10/openfile.c:195
 msgid "writing to stdout\n"
 msgstr "正在寫入到標準輸出\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:316
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假設被簽署的資料在 `%s'\n"
 
-#: g10/openfile.c:397
+#: g10/openfile.c:395
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的設定檔 `%s' 被建立了\n"
 
-#: g10/openfile.c:399
+#: g10/openfile.c:397
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
-#: g10/parse-packet.c:193
+#: g10/parse-packet.c:191
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:798
+#: g10/parse-packet.c:796
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1249
+#: g10/parse-packet.c:1247
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:315 g10/passphrase.c:605
+#: g10/passphrase.c:313 g10/passphrase.c:603
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:329
+#: g10/passphrase.c:327
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5166,24 +5163,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:352
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:356
+#: g10/passphrase.c:354
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:380
+#: g10/passphrase.c:378
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:452
+#: g10/passphrase.c:384 g10/passphrase.c:450
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:582
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5192,17 +5189,17 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:592
+#: g10/passphrase.c:590
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:601
+#: g10/passphrase.c:599
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
 
-#: g10/photoid.c:74
+#: g10/photoid.c:72
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5216,112 +5213,112 @@ msgstr ""
 "妳的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:96
+#: g10/photoid.c:94
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:117
+#: g10/photoid.c:115
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
-#: g10/photoid.c:128
+#: g10/photoid.c:126
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:130
+#: g10/photoid.c:128
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "妳確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:147
+#: g10/photoid.c:145
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
-#: g10/photoid.c:166
+#: g10/photoid.c:164
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:370
+#: g10/photoid.c:368
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:625
+#: g10/pkclist.c:60 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:627
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:66 g10/revoke.c:626
+#: g10/pkclist.c:64 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:68 g10/revoke.c:628
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:70 g10/revoke.c:629
+#: g10/pkclist.c:68 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:72
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:89
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
 #  a string with valid answers
-#: g10/pkclist.c:206
+#: g10/pkclist.c:204
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:212
 msgid "No trust value assigned to:\n"
 msgstr "下列項目沒有對應的信任值:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:244
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:254
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:269
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = 我不知道或不想說\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我*不*信任\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我徹底信任\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:283
 msgid "  m = back to the main menu\n"
 msgstr " m = 回到主選單\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:286
 msgid "  s = skip this key\n"
 msgstr " s = 跳過這把金鑰\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:287
 msgid "  q = quit\n"
 msgstr "  q = 離開\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:291
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5330,37 +5327,37 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:654
+#: g10/pkclist.c:297 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:318
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "請問妳是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:332
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被徹底信任金鑰的憑證:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:417
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:422
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:428
 msgid "This key probably belongs to the named user\n"
 msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:433
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:459
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5370,105 +5367,105 @@ msgstr ""
 "除非妳 **真的** 知道自己在做甚麼,\n"
 "否則妳最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:478
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:514
+#: g10/pkclist.c:512
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:519
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:530
+#: g10/pkclist.c:528
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:531
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告: 這把金鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:534
+#: g10/pkclist.c:532
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         這很有可能表示這個簽章是被偽造的.\n"
 
-#: g10/pkclist.c:540
+#: g10/pkclist.c:538
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:543
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
-#: g10/pkclist.c:565
+#: g10/pkclist.c:563
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:570
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:582
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:590
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:601
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:614
+#: g10/pkclist.c:612
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:614
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:622
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:625
+#: g10/pkclist.c:623
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:631
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:633
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
+#: g10/pkclist.c:832 g10/pkclist.c:874 g10/pkclist.c:1086 g10/pkclist.c:1156
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:846 g10/pkclist.c:1126
+#: g10/pkclist.c:844 g10/pkclist.c:1124
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
-#: g10/pkclist.c:897
+#: g10/pkclist.c:895
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:921
+#: g10/pkclist.c:919
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:945
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5476,176 +5473,176 @@ msgstr ""
 "\n"
 "輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:972
+#: g10/pkclist.c:970
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:981 g10/pkclist.c:1055
+#: g10/pkclist.c:979 g10/pkclist.c:1053
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1000
 msgid "Public key is disabled.\n"
 msgstr "公鑰被禁用了.\n"
 
-#: g10/pkclist.c:1011
+#: g10/pkclist.c:1009
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已經被設過了\n"
 
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1044
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1104
+#: g10/pkclist.c:1102
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
-#: g10/pkclist.c:1166
+#: g10/pkclist.c:1164
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/pkclist.c:1480
+#: g10/pkclist.c:1478
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/pkclist.c:1505
+#: g10/pkclist.c:1503
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:474
+#: g10/plaintext.c:472
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:481
+#: g10/plaintext.c:479
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:513
+#: g10/plaintext.c:511
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:551
+#: g10/plaintext.c:549
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:567
+#: g10/plaintext.c:565
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/plaintext.c:601
+#: g10/plaintext.c:599
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:105
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:136
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:227
+#: g10/pubkey-enc.c:225
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:248
+#: g10/pubkey-enc.c:246
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "編密演算法 %d%s 未知或已停用了\n"
 
-#: g10/pubkey-enc.c:286
+#: g10/pubkey-enc.c:284
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
-#: g10/pubkey-enc.c:306
+#: g10/pubkey-enc.c:304
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
-#: g10/pubkey-enc.c:312
+#: g10/pubkey-enc.c:310
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:589
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:587
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "將被撤銷:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(這是把機密的撤銷金鑰)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:555
+#: g10/revoke.c:327 g10/revoke.c:553
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:569
+#: g10/revoke.c:342 g10/revoke.c:567
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:472
+#: g10/revoke.c:470
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:501
+#: g10/revoke.c:499
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:512
+#: g10/revoke.c:510
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:519
+#: g10/revoke.c:517
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:536
+#: g10/revoke.c:534
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:544
+#: g10/revoke.c:542
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意: 這把金鑰沒有被保護!\n"
 
-#: g10/revoke.c:595
+#: g10/revoke.c:593
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5664,243 +5661,243 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:637
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:649
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:690
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:720
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:725
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/seckey-cert.c:63
+#: g10/seckey-cert.c:61
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保護演算法 %d%s 未被支援\n"
 
-#: g10/seckey-cert.c:74
+#: g10/seckey-cert.c:72
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: g10/seckey-cert.c:293
+#: g10/seckey-cert.c:291
 msgid "Invalid passphrase; please try again"
 msgstr "無效的密語; 請再試一次"
 
-#: g10/seckey-cert.c:294
+#: g10/seckey-cert.c:292
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:363
+#: g10/seckey-cert.c:361
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
 
-#: g10/seckey-cert.c:406
+#: g10/seckey-cert.c:404
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
-#: g10/seskey.c:63 sm/encrypt.c:121
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "建立了弱金鑰 - 正在重試\n"
 
-#: g10/seskey.c:67
+#: g10/seskey.c:65
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:229 sm/certcheck.c:91
+#: g10/seskey.c:227 sm/certcheck.c:89
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:242
+#: g10/seskey.c:240
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:254
+#: g10/seskey.c:252
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:82
+#: g10/sig-check.c:80
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:107
+#: g10/sig-check.c:105
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/sig-check.c:119
+#: g10/sig-check.c:117
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:191
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:192
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:298
+#: g10/sig-check.c:296
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:563
+#: g10/sig-check.c:561
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:588
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:82
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
-#: g10/sign.c:94
+#: g10/sign.c:90
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
 
-#: g10/sign.c:108
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:125
+#: g10/sign.c:121
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:129
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
 
-#: g10/sign.c:146
+#: g10/sign.c:142
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:174
+#: g10/sign.c:170
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:347
+#: g10/sign.c:343
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:356
+#: g10/sign.c:352
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:792
+#: g10/sign.c:788
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:868
+#: g10/sign.c:864
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:995
+#: g10/sign.c:991
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1110
+#: g10/sign.c:1106
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1294
+#: g10/sign.c:1290
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:151 g10/skclist.c:215
+#: g10/skclist.c:149 g10/skclist.c:213
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:182
+#: g10/skclist.c:180
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
+#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/skclist.c:195
+#: g10/skclist.c:193
 msgid "skipped: secret key already present\n"
 msgstr "已跳過: 私鑰已經存在\n"
 
-#: g10/skclist.c:210
+#: g10/skclist.c:208
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5909,340 +5906,340 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "列太長"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "冒號缺漏"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "無效的指紋"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "主觀信任值缺漏"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:130 g10/tdbio.c:1439
+#: g10/tdbio.c:128 g10/tdbio.c:1437
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:137 g10/tdbio.c:1446
+#: g10/tdbio.c:135 g10/tdbio.c:1444
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:247
+#: g10/tdbio.c:245
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
-#: g10/tdbio.c:500
+#: g10/tdbio.c:498
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: g10/tdbio.c:515
+#: g10/tdbio.c:513
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
+#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:587 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:527 g10/tdbio.c:592
+#: g10/tdbio.c:525 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
 
-#: g10/tdbio.c:553
+#: g10/tdbio.c:551
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:557
+#: g10/tdbio.c:555
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:560
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:642
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:650
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
-#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1369 g10/tdbio.c:1396
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:726
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1166
+#: g10/tdbio.c:1164
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1173
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1196
+#: g10/tdbio.c:1194
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1214
+#: g10/tdbio.c:1212
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1219
+#: g10/tdbio.c:1217
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1404
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取自由記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1412
+#: g10/tdbio.c:1410
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1420
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零時失敗: %s\n"
 
-#: g10/tdbio.c:1452
+#: g10/tdbio.c:1450
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加某筆記錄時失敗: %s\n"
 
-#: g10/tdbio.c:1497
+#: g10/tdbio.c:1495
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "無法處理長於 %d 字符的文字列\n"
 
-#: g10/textfilter.c:249
+#: g10/textfilter.c:247
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "輸入列比 %d 字符還長\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' 不是一個有效的長式金鑰 ID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已被標記成徹底信任了\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:120
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6252,146 +6249,140 @@ msgstr ""
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:207
+#: g10/verify.c:205
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:250
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: jnlib/logging.c:626
+#: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:88
+#: jnlib/utf8conv.c:86
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: jnlib/utf8conv.c:90
-#, fuzzy
-msgid ""
-"please see http://www.gnupg.org/download/iconv.html for more information\n"
-msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
-
-#: jnlib/utf8conv.c:126
+#: jnlib/utf8conv.c:124
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:134
+#: jnlib/utf8conv.c:132
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
+#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: kbx/kbxutil.c:86
+#: kbx/kbxutil.c:84
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:87
+#: kbx/kbxutil.c:85
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:108
+#: kbx/kbxutil.c:106
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: kbx/kbxutil.c:112
+#: kbx/kbxutil.c:110
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: kbx/kbxutil.c:115
+#: kbx/kbxutil.c:113
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:328 scd/app-openpgp.c:1330
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:332 scd/app-openpgp.c:1334 scd/app-openpgp.c:1366
-#: scd/app-openpgp.c:1485
+#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
+#: scd/app-openpgp.c:1483
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: scd/app-nks.c:380
+#: scd/app-nks.c:378
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:601
+#: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:614
+#: scd/app-openpgp.c:612
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生資料失敗: %s\n"
 
-#: scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1007
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2046
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2054
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2064
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1316
+#: scd/app-openpgp.c:1314
 #, fuzzy, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1350
+#: scd/app-openpgp.c:1348
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
+#: scd/app-openpgp.c:2317
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1449
+#: scd/app-openpgp.c:1447
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2527
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2536
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
-#: scd/app-openpgp.c:1475
+#: scd/app-openpgp.c:1473
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
@@ -6399,374 +6390,374 @@ msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺�
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1482
+#: scd/app-openpgp.c:1480
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1629
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1633
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2132
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2139
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1699
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1703
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:1707
+#: scd/app-openpgp.c:1705
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:1874
+#: scd/app-openpgp.c:1872
 msgid "creation timestamp missing\n"
 msgstr "建立的時間戳印缺漏\n"
 
-#: scd/app-openpgp.c:1881
+#: scd/app-openpgp.c:1879
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1888
+#: scd/app-openpgp.c:1886
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
+#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1964
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2025
+#: scd/app-openpgp.c:2023
 msgid "please wait while key is being generated ...\n"
 msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2039
+#: scd/app-openpgp.c:2037
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2042
+#: scd/app-openpgp.c:2040
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2099
+#: scd/app-openpgp.c:2097
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2149
+#: scd/app-openpgp.c:2147
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2237
+#: scd/app-openpgp.c:2235
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: scd/app-openpgp.c:2298
+#: scd/app-openpgp.c:2296
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2541
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:2614 scd/app-openpgp.c:2624
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:113 sm/gpgsm.c:359
+#: scd/scdaemon.c:111 sm/gpgsm.c:357
 #, fuzzy
 msgid "read options from file"
 msgstr "從 `%s' 讀取選項\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "顯示管理者指令"
 
-#: scd/scdaemon.c:195
+#: scd/scdaemon.c:206
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: scd/scdaemon.c:197
+#: scd/scdaemon.c:208
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:654
+#: scd/scdaemon.c:671
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1002
+#: scd/scdaemon.c:1019
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1007
+#: scd/scdaemon.c:1024
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:327
+#: sm/base64.c:325
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:214
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:226
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:240
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:176
+#: sm/certchain.c:174
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/certchain.c:214
+#: sm/certchain.c:212
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:253
+#: sm/certchain.c:250
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:263
+#: sm/certchain.c:260
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: sm/certchain.c:270 sm/certchain.c:299
+#: sm/certchain.c:267 sm/certchain.c:296
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:274 sm/certchain.c:303
+#: sm/certchain.c:271 sm/certchain.c:300
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "未被允許匯出私鑰\n"
 
-#: sm/certchain.c:414
+#: sm/certchain.c:411
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:434
+#: sm/certchain.c:431
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:587 sm/certchain.c:753 sm/certchain.c:1334 sm/decrypt.c:261
-#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:584 sm/certchain.c:750 sm/certchain.c:1331 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:326 sm/verify.c:105
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: sm/certchain.c:678
+#: sm/certchain.c:675
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: sm/certchain.c:687
+#: sm/certchain.c:684
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:691
+#: sm/certchain.c:688
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的金鑰於: "
 
-#: sm/certchain.c:693
+#: sm/certchain.c:690
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:698
+#: sm/certchain.c:695
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:794
+#: sm/certchain.c:791
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "產生一份撤銷憑證"
 
-#: sm/certchain.c:823
+#: sm/certchain.c:820
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:839
+#: sm/certchain.c:836
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:852
+#: sm/certchain.c:849
 #, fuzzy
 msgid "certificate has expired"
 msgstr "這把金鑰已經過期了!"
 
-#: sm/certchain.c:895
+#: sm/certchain.c:892
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:963
+#: sm/certchain.c:960
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:978
+#: sm/certchain.c:975
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "憑證中心 (CA) 指紋: "
 
-#: sm/certchain.c:986
+#: sm/certchain.c:983
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1001
+#: sm/certchain.c:998
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1007
+#: sm/certchain.c:1004
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1017
+#: sm/certchain.c:1014
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:1044 sm/import.c:159
+#: sm/certchain.c:1041 sm/import.c:157
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1056
+#: sm/certchain.c:1053
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1089
+#: sm/certchain.c:1086
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "驗證某份簽章"
 
-#: sm/certchain.c:1119
+#: sm/certchain.c:1116
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1170
+#: sm/certchain.c:1167
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certcheck.c:103
+#: sm/certcheck.c:101
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: sm/certcheck.c:113
+#: sm/certcheck.c:111
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:68 sm/certdump.c:151
+#: sm/certdump.c:66 sm/certdump.c:149
 #, fuzzy
 msgid "none"
 msgstr "no"
 
-#: sm/certdump.c:162
+#: sm/certdump.c:160
 #, fuzzy
 msgid "[none]"
 msgstr "[未設定]"
 
-#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
+#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "錯誤: 無效的回應.\n"
 
-#: sm/certdump.c:560 sm/certdump.c:605
+#: sm/certdump.c:558 sm/certdump.c:603
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:642 sm/certdump.c:698
+#: sm/certdump.c:640 sm/certdump.c:696
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:667 sm/certdump.c:721
+#: sm/certdump.c:665 sm/certdump.c:719
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "錯誤: 無效的回應.\n"
 
-#: sm/certdump.c:938
+#: sm/certdump.c:936
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6777,316 +6768,316 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: sm/certlist.c:125
+#: sm/certlist.c:121
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:135 sm/keylist.c:258
+#: sm/certlist.c:131 sm/keylist.c:255
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: sm/certlist.c:145
+#: sm/certlist.c:141
 msgid "certificate should have not been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157
+#: sm/certlist.c:153
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168
+#: sm/certlist.c:164
 msgid "certificate should have not been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169
+#: sm/certlist.c:165
 msgid "certificate should have not been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170
+#: sm/certlist.c:166
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171
+#: sm/certlist.c:167
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:476
+#: sm/certreqgen.c:474
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: sm/certreqgen.c:489
+#: sm/certreqgen.c:487
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:507
+#: sm/certreqgen.c:505
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:516
+#: sm/certreqgen.c:514
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:519
+#: sm/certreqgen.c:517
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:536
+#: sm/certreqgen.c:534
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: sm/certreqgen.c:548
+#: sm/certreqgen.c:546
 #, fuzzy, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: sm/certreqgen.c:560
+#: sm/certreqgen.c:558
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: sm/certreqgen.c:576
+#: sm/certreqgen.c:574
 #, fuzzy, c-format
-msgid "line %d: key generation failed: %s\n"
+msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: sm/decrypt.c:326
+#: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:328
+#: sm/decrypt.c:326
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/delete.c:52 sm/delete.c:103
+#: sm/delete.c:50 sm/delete.c:101
 #, fuzzy, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
+#: sm/delete.c:111 sm/keydb.c:1395 sm/keydb.c:1495
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
 
-#: sm/delete.c:134
+#: sm/delete.c:132
 #, fuzzy, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: sm/delete.c:136
+#: sm/delete.c:134
 #, fuzzy, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: sm/delete.c:166
+#: sm/delete.c:164
 #, fuzzy, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: sm/encrypt.c:334
+#: sm/encrypt.c:332
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(沒有給定描述)\n"
 
-#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
+#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/export.c:622 sm/import.c:534
+#: sm/export.c:620 sm/import.c:532
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私鑰"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:285
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:287
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:289
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:294
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:311
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:315
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:319
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:321
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: sm/gpgsm.c:340
+#: sm/gpgsm.c:338
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:342
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "檢查簽章"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:343
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:348
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:354
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:355
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:360
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:377
+#: sm/gpgsm.c:375
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:383
+#: sm/gpgsm.c:381
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的編密演算法"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:383
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:385
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的壓縮演算法"
 
-#: sm/gpgsm.c:524
+#: sm/gpgsm.c:522
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:527
+#: sm/gpgsm.c:525
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7097,137 +7088,127 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:606
+#: sm/gpgsm.c:604
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:687
+#: sm/gpgsm.c:685
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:1238
+#: sm/gpgsm.c:1237
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1316
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1334
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1527
+#: sm/gpgsm.c:1529
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1591
-#, fuzzy
-msgid "key generation is not available from the commandline\n"
-msgstr "gpg-agent 在此階段無法使用\n"
-
-#: sm/gpgsm.c:1592
-#, fuzzy, c-format
-msgid "please use the script \"%s\" to generate a new key\n"
-msgstr "請選擇妳要產生的金鑰種類:\n"
-
-#: sm/import.c:110
+#: sm/import.c:108
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: sm/import.c:228
+#: sm/import.c:226
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "產生一份撤銷憑證"
 
-#: sm/import.c:236
+#: sm/import.c:234
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:422 sm/import.c:454
+#: sm/import.c:420 sm/import.c:452
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:377
+#: sm/import.c:541 tools/gpg-connect-agent.c:375
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: sm/keydb.c:190
+#: sm/keydb.c:188
 #, fuzzy, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: sm/keydb.c:193
+#: sm/keydb.c:191
 msgid "you may want to start the gpg-agent first\n"
 msgstr ""
 
-#: sm/keydb.c:198
+#: sm/keydb.c:196
 #, fuzzy, c-format
 msgid "keybox `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1310 sm/keydb.c:1378
 #, fuzzy
 msgid "failed to get the fingerprint\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: sm/keydb.c:1319 sm/keydb.c:1387
+#: sm/keydb.c:1317 sm/keydb.c:1385
 #, fuzzy
 msgid "failed to allocate keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: sm/keydb.c:1340
+#: sm/keydb.c:1338
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1348
+#: sm/keydb.c:1346
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: sm/keydb.c:1356
+#: sm/keydb.c:1354
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: sm/keydb.c:1408
+#: sm/keydb.c:1406
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1417 sm/keydb.c:1509
+#: sm/keydb.c:1415 sm/keydb.c:1507
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: sm/keydb.c:1429 sm/keydb.c:1520
+#: sm/keydb.c:1427 sm/keydb.c:1518
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: sm/misc.c:57
+#: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:113
+#: sm/qualified.c:111
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: sm/qualified.c:131
+#: sm/qualified.c:129
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:227
+#: sm/qualified.c:225
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7238,13 +7219,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:236
+#: sm/qualified.c:234
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:329
+#: sm/qualified.c:327
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7252,246 +7233,250 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:447
+#: sm/sign.c:445
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:386
 #, fuzzy
 msgid "Signature made "
 msgstr "由 %s 建立的簽章\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:390
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:391
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr ""
 
-#: sm/verify.c:509
+#: sm/verify.c:507
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: sm/verify.c:510
+#: sm/verify.c:508
 #, fuzzy
 msgid "                aka"
 msgstr "                亦即 \"%s\""
 
-#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:60
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:61
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:64
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:67
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:127
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:132
+#: tools/gpg-connect-agent.c:130
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:317
+#: tools/gpg-connect-agent.c:315
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:326
+#: tools/gpg-connect-agent.c:324
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:384
+#: tools/gpg-connect-agent.c:382
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太長"
 
-#: tools/gpg-connect-agent.c:388
+#: tools/gpg-connect-agent.c:386
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:460
+#: tools/gpg-connect-agent.c:458
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: tools/gpg-connect-agent.c:468
+#: tools/gpg-connect-agent.c:466
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: tools/gpg-connect-agent.c:476
+#: tools/gpg-connect-agent.c:474
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:786
+#: tools/gpg-connect-agent.c:784
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/gpg-connect-agent.c:795
+#: tools/gpg-connect-agent.c:793
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
+#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:736
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
-#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:471 tools/gpgconf-comp.c:551 tools/gpgconf-comp.c:618
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:759
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:687 tools/gpgconf-comp.c:766
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
-#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:581 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:774
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:586 tools/gpgconf-comp.c:700
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490
+#: tools/gpgconf-comp.c:501
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:494
+#: tools/gpgconf-comp.c:505
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:498
+#: tools/gpgconf-comp.c:509
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:519
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:627
+#: tools/gpgconf-comp.c:638
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:643
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:682
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:705
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:749
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:774
+#: tools/gpgconf-comp.c:785
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:795
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:806
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:848
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf-comp.c:2681
+msgid "Note that group specifications are ignored\n"
+msgstr ""
+
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:60
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:62
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的組態項目 `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:70
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:92
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:95
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:170 tools/gpgconf.c:203
+#: tools/gpgconf.c:168 tools/gpgconf.c:201
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpg [選項] "
 
-#: tools/gpgconf.c:172
+#: tools/gpgconf.c:170
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:181
+#: tools/gpgconf.c:179
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公鑰"
 
-#: tools/gpgconf.c:205
+#: tools/gpgconf.c:203
 #, fuzzy
 msgid "No argument allowed"
 msgstr "未允許使用管理者指令\n"
@@ -7501,7 +7486,7 @@ msgstr "未允許使用管理者指令\n"
 msgid "error allocating enough memory: %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: tools/symcryptrun.c:154
+#: tools/symcryptrun.c:152
 #, fuzzy
 msgid ""
 "@\n"
@@ -7511,166 +7496,179 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: tools/symcryptrun.c:156
+#: tools/symcryptrun.c:154
 #, fuzzy
 msgid "decryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:157
+#: tools/symcryptrun.c:155
 #, fuzzy
 msgid "encryption modus"
 msgstr "解密成功\n"
 
-#: tools/symcryptrun.c:161
+#: tools/symcryptrun.c:159
 msgid "tool class (confucius)"
 msgstr ""
 
-#: tools/symcryptrun.c:162
+#: tools/symcryptrun.c:160
 #, fuzzy
 msgid "program filename"
 msgstr "--store [檔名]"
 
-#: tools/symcryptrun.c:164
+#: tools/symcryptrun.c:162
 msgid "secret key file (required)"
 msgstr ""
 
-#: tools/symcryptrun.c:165
+#: tools/symcryptrun.c:163
 msgid "input file name (default stdin)"
 msgstr ""
 
-#: tools/symcryptrun.c:209
+#: tools/symcryptrun.c:207
 #, fuzzy
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/symcryptrun.c:212
+#: tools/symcryptrun.c:210
 msgid ""
 "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:281
+#: tools/symcryptrun.c:279
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: tools/symcryptrun.c:288
+#: tools/symcryptrun.c:286
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: tools/symcryptrun.c:314
+#: tools/symcryptrun.c:312
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
+#: tools/symcryptrun.c:352 tools/symcryptrun.c:369
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:382
+#: tools/symcryptrun.c:380
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: tools/symcryptrun.c:389
+#: tools/symcryptrun.c:387
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:394 tools/symcryptrun.c:401
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: tools/symcryptrun.c:517
+#: tools/symcryptrun.c:515
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: tools/symcryptrun.c:523
+#: tools/symcryptrun.c:521
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:529
+#: tools/symcryptrun.c:527
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:540
+#: tools/symcryptrun.c:538
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:558
+#: tools/symcryptrun.c:556
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:565
+#: tools/symcryptrun.c:563
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:581
+#: tools/symcryptrun.c:579
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:638
+#: tools/symcryptrun.c:636
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: tools/symcryptrun.c:655
+#: tools/symcryptrun.c:653
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:707
+#: tools/symcryptrun.c:705
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:759
+#: tools/symcryptrun.c:757
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:773
+#: tools/symcryptrun.c:771
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:828
+#: tools/symcryptrun.c:826
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:841
+#: tools/symcryptrun.c:839
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:1016
+#: tools/symcryptrun.c:1014
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1043
+#: tools/symcryptrun.c:1041
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1052
+#: tools/symcryptrun.c:1050
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
+#~ msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+
+#, fuzzy
+#~ msgid "key generation is not available from the commandline\n"
+#~ msgstr "gpg-agent 在此階段無法使用\n"
+
+#, fuzzy
+#~ msgid "please use the script \"%s\" to generate a new key\n"
+#~ msgstr "請選擇妳要產生的金鑰種類:\n"
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 5880d8e25..e46e8e9ec 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -6,6 +6,7 @@
 	(handle_connections) [W32]: Enable a dummy sigs event.
 	(handle_connections): Use a proper count for select and not
 	FD_SETSIZE.
+	(fixed_gcry_pth_init, main): Kludge to fix pth initialization.
 
 2007-06-21  Werner Koch  <[email protected]>
 
diff --git a/scd/Makefile.am b/scd/Makefile.am
index c51da4795..2030c3ffb 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/scd/apdu.c b/scd/apdu.c
index 7a29ed70e..4e044c272 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/apdu.h b/scd/apdu.h
index c3af82506..92d073897 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/app-common.h b/scd/app-common.h
index 3b828780d..1334cb23f 100644
--- a/scd/app-common.h
+++ b/scd/app-common.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/app-dinsig.c b/scd/app-dinsig.c
index 981568804..54b54b150 100644
--- a/scd/app-dinsig.c
+++ b/scd/app-dinsig.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/scd/app-help.c b/scd/app-help.c
index 861d8e3bc..45c7586f7 100644
--- a/scd/app-help.c
+++ b/scd/app-help.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 5feabc1ec..514ae1058 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 2b7263171..893cc572f 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 475226270..31fb77ed4 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Information pertaining to the BELPIC developer card samples:
diff --git a/scd/app.c b/scd/app.c
index e9cbcbb6f..3411c186c 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/atr.c b/scd/atr.c
index bd5a22621..cb6b05a7d 100644
--- a/scd/atr.c
+++ b/scd/atr.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/atr.h b/scd/atr.h
index c70089ca5..5f07522d1 100644
--- a/scd/atr.h
+++ b/scd/atr.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ATR_H
diff --git a/scd/card-common.h b/scd/card-common.h
index dd7529d5b..78f2f6047 100644
--- a/scd/card-common.h
+++ b/scd/card-common.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CARD_COMMON_H
diff --git a/scd/card-dinsig.c b/scd/card-dinsig.c
index d50d758f2..0cbcd3169 100644
--- a/scd/card-dinsig.c
+++ b/scd/card-dinsig.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* The German signature law and its bylaw (SigG and SigV) is currently
diff --git a/scd/card-p15.c b/scd/card-p15.c
index 63d537d5a..b95825373 100644
--- a/scd/card-p15.c
+++ b/scd/card-p15.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/card.c b/scd/card.c
index 7a41ab7bb..a0213483f 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 33de4921b..ec847c6cb 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index 6f6527108..341876b22 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/scd/command.c b/scd/command.c
index fa5a18977..5f787e2fb 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 943961da7..b38ae4fd0 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/iso7816.h b/scd/iso7816.h
index 8f7907405..ebc121afc 100644
--- a/scd/iso7816.h
+++ b/scd/iso7816.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index 633d5b80e..b913cdc12 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c
index b18311f44..6a6c0e0d3 100644
--- a/scd/sc-copykeys.c
+++ b/scd/sc-copykeys.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 8b86f8b7f..ea42f7cfa 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -185,6 +183,10 @@ static void handle_connections (int listen_fd);
 
 /* Pth wrapper function definitions. */
 GCRY_THREAD_OPTION_PTH_IMPL;
+static int fixed_gcry_pth_init (void)
+{
+  return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
+}
 
 
 
@@ -320,6 +322,7 @@ main (int argc, char **argv )
 
   /* Libgcrypt requires us to register the threading model first.
      Note that this will also do the pth_init. */
+  gcry_threads_pth.init = fixed_gcry_pth_init;
   err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
   if (err)
     {
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index 4086b854c..762ba7457 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SCDAEMON_H
diff --git a/scd/tlv.c b/scd/tlv.c
index 6ddbeaf1f..e665f9087 100644
--- a/scd/tlv.c
+++ b/scd/tlv.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/scd/tlv.h b/scd/tlv.h
index 877573d25..66ea871bc 100644
--- a/scd/tlv.h
+++ b/scd/tlv.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SCD_TLV_H
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 1aac541e8..e391adff3 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	Switched to GPLv3+.
+
+	* config.sub, config.guess: Updated from current Savannah
+	upstream.  Changed to GPLv3+.
+
 2007-05-04  Werner Koch  <[email protected]>
 
 	* texinfo.tex: Updated from gnulib.
@@ -11,7 +18,7 @@
 	* config.guess, config.sub: Updated.
 
 
- Copyright 2004 Free Software Foundation, Inc.
+ Copyright 2004, 2007 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/scripts/compile b/scripts/compile
index 1b1d23216..c98532435 100755
--- a/scripts/compile
+++ b/scripts/compile
@@ -8,7 +8,7 @@ scriptversion=2005-05-14.22
 #
 # This program 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, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -17,9 +17,8 @@ scriptversion=2005-05-14.22
 # 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.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
diff --git a/scripts/config.guess b/scripts/config.guess
index c38553dc7..4ba338e01 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,13 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2007-05-17'
 
 # This file 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -16,9 +17,7 @@ timestamp='2006-02-23'
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -160,6 +159,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -210,7 +210,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -328,7 +328,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -770,6 +770,8 @@ EOF
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -777,10 +779,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS_NT-*:*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +789,15 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[345]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -831,6 +833,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -947,6 +952,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -989,7 +997,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -1205,6 +1213,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/scripts/config.sub b/scripts/config.sub
index ad9f39571..10499a819 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -11,7 +12,7 @@ timestamp='2006-02-23'
 #
 # This file 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -20,9 +21,7 @@ timestamp='2006-02-23'
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -240,15 +239,16 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,21 +274,19 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,18 +316,18 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,23 +356,21 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -477,8 +473,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -685,6 +681,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -912,6 +912,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -923,6 +927,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1128,7 +1135,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1224,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1376,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1391,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1406,6 +1419,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/scripts/depcomp b/scripts/depcomp
index ca5ea4e1e..e1c6e3492 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -8,7 +8,7 @@ scriptversion=2006-10-15.18
 
 # This program 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, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/mdate-sh b/scripts/mdate-sh
index cd916c0a3..9a6d216e3 100755
--- a/scripts/mdate-sh
+++ b/scripts/mdate-sh
@@ -18,9 +18,7 @@ scriptversion=2005-06-29.22
 # 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.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
diff --git a/scripts/missing b/scripts/missing
index 1c8ff7049..cff574bed 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -9,7 +9,7 @@ scriptversion=2006-05-10.23
 
 # This program 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, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/texinfo.tex b/scripts/texinfo.tex
index d14477484..5063065f2 100644
--- a/scripts/texinfo.tex
+++ b/scripts/texinfo.tex
@@ -11,7 +11,7 @@
 %
 % This texinfo.tex file 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, or (at
+% published by the Free Software Foundation; either version 3, or (at
 % your option) any later version.
 %
 % This texinfo.tex file is distributed in the hope that it will be
@@ -20,9 +20,8 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with this texinfo.tex file; see the file COPYING.  If not, 
+% see <http://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
diff --git a/sm/ChangeLog b/sm/ChangeLog
index ab9b89977..8f24b1d40 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-04  Werner Koch  <[email protected]>
+
+	* certchain.c (check_cert_policy): Remove extra checks for
+	GPG_ERR_NO_VALUE.  They are not needed since libksba 1.0.1.
+	* keylist.c (print_capabilities, list_cert_raw, list_cert_std): Ditto.
+	* certlist.c (cert_usage_p, cert_usage_p): Ditto.
+
 2007-06-26  Werner Koch  <[email protected]>
 
 	* gpgsm.c (main): Call gnupg_rl_initialize.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 8171af54b..9427905a1 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/sm/base64.c b/sm/base64.c
index cc94d4b88..b0c8dc8e8 100644
--- a/sm/base64.c
+++ b/sm/base64.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 9483785cc..da952dc09 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 8ce4fd8f1..9273ffb21 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/certchain.c b/sm/certchain.c
index 4625372c7..7ce7e6889 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -227,8 +225,7 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
   int any_critical;
 
   err = ksba_cert_get_cert_policies (cert, &policies);
-  if (gpg_err_code (err) == GPG_ERR_NO_DATA 
-      || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     return 0; /* No policy given. */
   if (err)
     return err;
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 0a362d3fb..5375408ac 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/certdump.c b/sm/certdump.c
index 743b4dd41..b8f35286a 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/certlist.c b/sm/certlist.c
index 650f3a958..e7112f39f 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -57,8 +55,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
   int have_ocsp_signing = 0;
 
   err = ksba_cert_get_ext_key_usages (cert, &extkeyusages);
-  if (gpg_err_code (err) == GPG_ERR_NO_DATA
-      || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0; /* no policy given */
   if (!err)
     {
@@ -117,8 +114,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
 
 
       err = ksba_cert_get_key_usage (cert, &use);
-      if (gpg_err_code (err) == GPG_ERR_NO_DATA
-          || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+      if (gpg_err_code (err) == GPG_ERR_NO_DATA)
         {
           err = 0;
           if (opt.verbose && mode < 2)
@@ -456,8 +452,7 @@ gpgsm_find_cert (const char *name, ksba_sexp_t keyid, ksba_cert_t *r_cert)
                          subjectKeyIdentifier matches the requested
                          one. */
                     }
-                  else if (gpg_err_code (rc) == GPG_ERR_NO_DATA
-                           || gpg_err_code (rc) == GPG_ERR_NO_VALUE)
+                  else if (gpg_err_code (rc) == GPG_ERR_NO_DATA)
                     goto nextone;
                 }
             }
diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index 738999ff8..09a9456b7 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index bb30a63ec..05cfb485f 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/sm/decrypt.c b/sm/decrypt.c
index baf77d024..9ed47366a 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/delete.c b/sm/delete.c
index 199e53eb4..00f602827 100644
--- a/sm/delete.c
+++ b/sm/delete.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 0969c082f..1e36e960c 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/export.c b/sm/export.c
index 6420a2154..dd87246eb 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/fingerprint.c b/sm/fingerprint.c
index 584bf043d..1c65512a6 100644
--- a/sm/fingerprint.c
+++ b/sm/fingerprint.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 08f08049b..cf1ec4a30 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 62b106bfc..5a41a3d5d 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPGSM_H
diff --git a/sm/import.c b/sm/import.c
index 687ef3183..deebccfbc 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/keydb.c b/sm/keydb.c
index 254e24973..1fbf9b6c1 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/keydb.h b/sm/keydb.h
index 24744e864..a440c5047 100644
--- a/sm/keydb.h
+++ b/sm/keydb.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_KEYDB_H
diff --git a/sm/keylist.c b/sm/keylist.c
index de10bee3e..9ec7cd137 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -6,7 +6,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -242,8 +240,7 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
                gpg_strerror (err)); 
 
   err = ksba_cert_get_key_usage (cert, &use);
-  if (gpg_err_code (err) == GPG_ERR_NO_DATA
-      || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     {
       es_putc ('e', fp);
       es_putc ('s', fp);
@@ -646,11 +643,9 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   /* subjectKeyIdentifier */
   es_fputs ("    subjKeyId: ", fp);
   err = ksba_cert_get_subj_key_id (cert, NULL, &keyid);
-  if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA
-      || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+  if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
     {
-      if (gpg_err_code (err) == GPG_ERR_NO_DATA
-          || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+      if (gpg_err_code (err) == GPG_ERR_NO_DATA)
         es_fputs ("[none]\n", fp);
       else
         {
@@ -666,11 +661,9 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   /* authorityKeyIdentifier */
   es_fputs ("    authKeyId: ", fp);
   err = ksba_cert_get_auth_key_id (cert, &keyid, &name, &sexp);
-  if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA
-      || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+  if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
     {
-      if (gpg_err_code (err) == GPG_ERR_NO_DATA || !name
-          || gpg_err_code (err) == GPG_ERR_NO_VALUE)
+      if (gpg_err_code (err) == GPG_ERR_NO_DATA || !name)
         es_fputs ("[none]\n", fp);
       else
         {
@@ -693,8 +686,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
 
   es_fputs ("     keyUsage:", fp);
   err = ksba_cert_get_key_usage (cert, &kusage);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     {
       if (err)
         es_fprintf (fp, " [error: %s]", gpg_strerror (err));
@@ -726,8 +718,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
 
   es_fputs ("  extKeyUsage: ", fp);
   err = ksba_cert_get_ext_key_usages (cert, &string);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     { 
       if (err)
         es_fprintf (fp, "[error: %s]", gpg_strerror (err));
@@ -760,8 +751,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
 
   es_fputs ("     policies: ", fp);
   err = ksba_cert_get_cert_policies (cert, &string);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     {
       if (err)
         es_fprintf (fp, "[error: %s]", gpg_strerror (err));
@@ -986,8 +976,7 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
 
 
   err = ksba_cert_get_key_usage (cert, &kusage);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     {
       es_fputs ("    key usage:", fp);
       if (err)
@@ -1017,8 +1006,7 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
     }
 
   err = ksba_cert_get_ext_key_usages (cert, &string);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     { 
       es_fputs ("ext key usage: ", fp);
       if (err)
@@ -1048,8 +1036,7 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
     }
 
   err = ksba_cert_get_cert_policies (cert, &string);
-  if (gpg_err_code (err) != GPG_ERR_NO_DATA
-      && gpg_err_code (err) != GPG_ERR_NO_VALUE)
+  if (gpg_err_code (err) != GPG_ERR_NO_DATA)
     {
       es_fputs ("     policies: ", fp);
       if (err)
diff --git a/sm/misc.c b/sm/misc.c
index 86cb506d6..7da206aba 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/qualified.c b/sm/qualified.c
index d6d31ae95..1a0f52790 100644
--- a/sm/qualified.c
+++ b/sm/qualified.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/server.c b/sm/server.c
index 27749799c..6f11b2734 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/sign.c b/sm/sign.c
index 03ce6a754..9c2be1f5a 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/sm/verify.c b/sm/verify.c
index ae17d21f3..e44568872 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a3cfbbdda..60f83cd7b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@
 # 
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
diff --git a/tests/asschk.c b/tests/asschk.c
index 344deca49..356613901 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a simple stand-alone Assuan server test program.  We don't
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 070a0835a..cf32bb9b0 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
 
 GPG_IMPORT = ../../g10/gpg2 --homedir . \
diff --git a/tests/openpgp/multisig.test b/tests/openpgp/multisig.test
index ece6f22da..ee194aef9 100755
--- a/tests/openpgp/multisig.test
+++ b/tests/openpgp/multisig.test
@@ -142,4 +142,4 @@ for i in sig_1ls1ls_valid sig_ls_valid \
 done
 
 
-resume_error
\ No newline at end of file
+resume_error
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d085b9e09..4fda65d7b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,7 +5,7 @@
 # 
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
 	Manifest watchgnupg.c \
diff --git a/tools/convert-from-106 b/tools/convert-from-106
index 634152b11..173793be1 100755
--- a/tools/convert-from-106
+++ b/tools/convert-from-106
@@ -3,7 +3,7 @@
 #
 # This program 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -12,9 +12,7 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 if ! gpg --version > /dev/null 2>&1 ; then
    echo "GnuPG not available!"
    exit 1
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 7522ea916..a07a7b67d 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/gpg-zip.in b/tools/gpg-zip.in
index 8b4ccfb2b..d27b1f962 100644
--- a/tools/gpg-zip.in
+++ b/tools/gpg-zip.in
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Despite the name, PGP Zip format is actually an OpenPGP-wrapped tar
 # file.  To be compatible with PGP itself, this must be a USTAR format
 # tar file.  Unclear on whether there is a distinction here between
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 4a83adb9e..ba147ad48 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GnuPG; if not, write to the Free Software Foundation,
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * along with GnuPG; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if HAVE_CONFIG_H
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index fdf97932f..e71a24e7a 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/gpgconf.h b/tools/gpgconf.h
index b3ff258b0..59900b185 100644
--- a/tools/gpgconf.h
+++ b/tools/gpgconf.h
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPGCONF_H
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index dd2b5bb2c..a68fdf059 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c
index 30759f9a4..9001b4511 100644
--- a/tools/gpgparsemail.c
+++ b/tools/gpgparsemail.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh
index ea96bb2e9..23dfdd6ae 100755
--- a/tools/gpgsm-gencert.sh
+++ b/tools/gpgsm-gencert.sh
@@ -7,7 +7,7 @@
 #
 # GnuPG 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 set -e
 
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 8c1705396..bb8ea0a0c 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/make-dns-cert.c b/tools/make-dns-cert.c
index 496b63b0b..31314edc9 100644
--- a/tools/make-dns-cert.c
+++ b/tools/make-dns-cert.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/pgpgroup-to-gpggroup b/tools/pgpgroup-to-gpggroup
index 5ea9990b6..dbf854c9e 100755
--- a/tools/pgpgroup-to-gpggroup
+++ b/tools/pgpgroup-to-gpggroup
@@ -5,7 +5,7 @@
 #
 # This program 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # This program requires a PGP command line program that supports
 # groups (note that the PGP 8 command line doesn't).
 
diff --git a/tools/rfc822parse.c b/tools/rfc822parse.c
index 303ddad13..efa197dda 100644
--- a/tools/rfc822parse.c
+++ b/tools/rfc822parse.c
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
  * GNU Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/tools/rfc822parse.h b/tools/rfc822parse.h
index 8a56c51cb..12699d5e8 100644
--- a/tools/rfc822parse.h
+++ b/tools/rfc822parse.h
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
  * GNU Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef RFC822PARSE_H
diff --git a/tools/sockprox.c b/tools/sockprox.c
index 171facaa2..485b37a37 100644
--- a/tools/sockprox.c
+++ b/tools/sockprox.c
@@ -3,7 +3,7 @@
  *
  * sockprox 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * sockprox is distributed in the hope that it will be useful, but
@@ -12,9 +12,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Hacked by Moritz Schulte <[email protected]>. 
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index bca96e58d..74d82aa7b 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 051ca50fe..213a2cb16 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -5,7 +5,7 @@
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H